From 6b81a849c78fd73d33ba230d60ae82c02a6419b9 Mon Sep 17 00:00:00 2001 From: Jerome LAFORGE Date: Sat, 15 Sep 2012 11:04:35 +0200 Subject: Fix bad folding block when LOOP statement nested into CASE statement. Bug #3567905. --- lexers/LexSQL.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lexers/LexSQL.cxx') diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index d9013db9b..ccb88f8dc 100644 --- a/lexers/LexSQL.cxx +++ b/lexers/LexSQL.cxx @@ -719,8 +719,10 @@ void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle, levelNext--; //again for the "end case;" and block when } } else if (!options.foldOnlyBegin) { - if (strcmp(s, "case") == 0) + if (strcmp(s, "case") == 0) { sqlStatesCurrentLine = sqlStates.BeginCaseBlock(sqlStatesCurrentLine); + sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, true); + } if (levelCurrent > levelNext) levelCurrent = levelNext; @@ -728,7 +730,6 @@ void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle, if (!statementFound) levelNext++; - sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, true); statementFound = true; } else if (levelCurrent > levelNext) { // doesn't include this line into the folding block -- cgit v1.2.3