diff options
| author | Colomban Wendling <ban@herbesfolles.org> | 2013-11-15 17:16:55 +0100 |
|---|---|---|
| committer | Colomban Wendling <ban@herbesfolles.org> | 2013-11-15 17:16:55 +0100 |
| commit | 9365665c8c48d375fe37e36108ca7373ed6ef1e4 (patch) | |
| tree | 8109e918fe94abc0cf29d7d04c987279185aa2ec | |
| parent | 3248620b402246620855acd33fff375301931c36 (diff) | |
| download | scintilla-mirror-9365665c8c48d375fe37e36108ca7373ed6ef1e4.tar.gz | |
CMake: fix continuation after empty comments
Fixes [bugs:#1550].
| -rw-r--r-- | lexers/LexCmake.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lexers/LexCmake.cxx b/lexers/LexCmake.cxx index 70e9dee98..fb79abf26 100644 --- a/lexers/LexCmake.cxx +++ b/lexers/LexCmake.cxx @@ -226,14 +226,13 @@ static void ColouriseCmakeDoc(unsigned int startPos, int length, int, WordList * break; case SCE_CMAKE_COMMENT: - if ( cNextChar == '\n' || cNextChar == '\r' ) { - // Special case: - if ( cCurrChar == '\\' ) { + if ( cCurrChar == '\n' || cCurrChar == '\r' ) { + if ( styler.SafeGetCharAt(i-1) == '\\' ) { styler.ColourTo(i-2,state); - styler.ColourTo(i,SCE_CMAKE_DEFAULT); + styler.ColourTo(i-1,SCE_CMAKE_DEFAULT); } else { - styler.ColourTo(i,state); + styler.ColourTo(i-1,state); state = SCE_CMAKE_DEFAULT; } } @@ -335,10 +334,7 @@ static void ColouriseCmakeDoc(unsigned int startPos, int length, int, WordList * break; } - if ( state == SCE_CMAKE_COMMENT) { - styler.ColourTo(i,state); - } - else if ( state == SCE_CMAKE_STRINGDQ || state == SCE_CMAKE_STRINGLQ || state == SCE_CMAKE_STRINGRQ ) { + if ( state == SCE_CMAKE_STRINGDQ || state == SCE_CMAKE_STRINGLQ || state == SCE_CMAKE_STRINGRQ ) { bool bIngoreNextDollarSign = false; if ( bVarInString && cCurrChar == '$' ) { |