diff options
| author | nyamatongwe <unknown> | 2011-03-27 12:57:55 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2011-03-27 12:57:55 +1100 |
| commit | ef7f8a349a89dd7d72d62f7a162cb3e553ca4ba6 (patch) | |
| tree | 93e2435e7cf155f88017f4a0951b4d5904dab881 | |
| parent | 97359fb4230a10582c01f309ccfd1ac399ec0fcd (diff) | |
| download | scintilla-mirror-ef7f8a349a89dd7d72d62f7a162cb3e553ca4ba6.tar.gz | |
Fix folding failure with PHP within a line of Javascript. Bug #3193530.
| -rw-r--r-- | lexers/LexHTML.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index 8e6b37434..ae4b74c7d 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -883,6 +883,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty (ch == '<') && (chNext == '?') && !IsScriptCommentState(state) ) { + beforeLanguage = scriptLanguage; scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; styler.ColourTo(i - 1, StateToPrint); @@ -1154,7 +1155,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) { levelCurrent--; } - scriptLanguage = eScriptNone; + scriptLanguage = beforeLanguage; continue; } ///////////////////////////////////// |