diff options
| author | Stephan Deibel <unknown> | 2017-10-26 08:53:46 +1100 |
|---|---|---|
| committer | Stephan Deibel <unknown> | 2017-10-26 08:53:46 +1100 |
| commit | 783227a0b5abfee66c10d1328b79b026b393946f (patch) | |
| tree | abc0be0d665c667479127085431ebfa3af4dbf1b | |
| parent | 54f5e019a7025be1b79a0402fbabba45ffffc80a (diff) | |
| download | scintilla-mirror-783227a0b5abfee66c10d1328b79b026b393946f.tar.gz | |
Fix nested Django tags inside a comment breaking highlighting of rest of file.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexHTML.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 7e74594f5..e3e11c19b 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -534,6 +534,10 @@ Released 23 October 2017. </li> <li> + Fix HTML lexer handling of Django so that nesting a {{ }} or {% %} + Django tag inside of a {# #} Django comment does not break highlighting of rest of file + </li> + <li> Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13. <a href="http://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>. </li> diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index 018da1d4a..e17ba116c 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -1015,7 +1015,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i } // handle the start Django template code - else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' || chNext == '{'))) { + else if (isDjango && scriptLanguage != eScriptPython && scriptLanguage != eScriptComment && (ch == '{' && (chNext == '%' || chNext == '{'))) { if (chNext == '%') StringCopy(djangoBlockType, "%"); else |