diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-03-17 09:01:12 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-03-17 09:01:12 +1100 |
| commit | 3d8dc2f8fcd5408235eb2fee4e7d1ffd9ba67f95 (patch) | |
| tree | 82284fd41ff6f1836fa49cec99d662161108f979 | |
| parent | 50fda0af2af33525bbc618762f24cdfd69039410 (diff) | |
| download | scintilla-mirror-3d8dc2f8fcd5408235eb2fee4e7d1ffd9ba67f95.tar.gz | |
Bug [#1583]. Fix keyword style extending past end of word.
From Alpha.
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | lexers/LexCoffeeScript.cxx | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 85eee8f1f..35598a358 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -485,6 +485,11 @@ ';' to separate statements. </li> <li> + Fix Coffeescript lexer for keyword style extending past end of word. + Also fixes styling 0...myArray.length all as a number. + <a href="http://sourceforge.net/p/scintilla/bugs/1583/">Bug #1583</a>. + </li> + <li> Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs. </li> <li> diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx index 9da531adb..def93599d 100644 --- a/lexers/LexCoffeeScript.cxx +++ b/lexers/LexCoffeeScript.cxx @@ -204,6 +204,13 @@ static void ColouriseCoffeeScriptDoc(unsigned int startPos, int length, int init sc.SetState(SCE_COFFEESCRIPT_DEFAULT); } break; + case SCE_COFFEESCRIPT_WORD: + case SCE_COFFEESCRIPT_WORD2: + case SCE_COFFEESCRIPT_GLOBALCLASS: + if (!setWord.Contains(sc.ch)) { + sc.SetState(SCE_COFFEESCRIPT_DEFAULT); + } + break; case SCE_COFFEESCRIPT_PREPROCESSOR: if (sc.atLineStart && !continuationLine) { sc.SetState(SCE_COFFEESCRIPT_DEFAULT); |