aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexers/LexBash.cxx
diff options
context:
space:
mode:
authorColomban Wendling <unknown>2018-09-04 16:00:23 +1000
committerColomban Wendling <unknown>2018-09-04 16:00:23 +1000
commitedcee29c8fbddaf8368223b47c74b0b6401e8c6f (patch)
tree3606f1002a76fcd6b2df809d0a4b97c6a4654649 /lexers/LexBash.cxx
parenta52b980b2ddeda48f17b07adc898ac7a28a11c15 (diff)
downloadscintilla-mirror-edcee29c8fbddaf8368223b47c74b0b6401e8c6f.tar.gz
Feature [feature-requests:#1144]. Add folding for shell if, do, and case.
Implemented by Zufu Liu and Colomban Wendling.
Diffstat (limited to 'lexers/LexBash.cxx')
-rw-r--r--lexers/LexBash.cxx15
1 files changed, 15 insertions, 0 deletions
diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx
index 931d1bf47..5bbd563d5 100644
--- a/lexers/LexBash.cxx
+++ b/lexers/LexBash.cxx
@@ -824,6 +824,8 @@ static void FoldBashDoc(Sci_PositionU startPos, Sci_Position length, int, WordLi
int levelCurrent = levelPrev;
char chNext = styler[startPos];
int styleNext = styler.StyleAt(startPos);
+ char word[8] = { '\0' }; // we're not interested in long words anyway
+ unsigned int wordlen = 0;
for (Sci_PositionU i = startPos; i < endPos; i++) {
char ch = chNext;
chNext = styler.SafeGetCharAt(i + 1);
@@ -840,6 +842,19 @@ static void FoldBashDoc(Sci_PositionU startPos, Sci_Position length, int, WordLi
&& !IsCommentLine(lineCurrent + 1, styler))
levelCurrent--;
}
+ if (style == SCE_SH_WORD) {
+ if ((wordlen + 1) < sizeof(word))
+ word[wordlen++] = ch;
+ if (styleNext != style) {
+ word[wordlen] = '\0';
+ wordlen = 0;
+ if (strcmp(word, "if") == 0 || strcmp(word, "case") == 0 || strcmp(word, "do") == 0) {
+ levelCurrent++;
+ } else if (strcmp(word, "fi") == 0 || strcmp(word, "esac") == 0 || strcmp(word, "done") == 0) {
+ levelCurrent--;
+ }
+ }
+ }
if (style == SCE_SH_OPERATOR) {
if (ch == '{') {
levelCurrent++;