diff options
| author | nyamatongwe <devnull@localhost> | 2011-03-27 12:57:55 +1100 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-03-27 12:57:55 +1100 |
| commit | 3ed550474301fa98e75c23d1f9c55763b296224e (patch) | |
| tree | 6ef36307ed2a420be5994ad6f0b152cd5f1eedb0 /lexers/LexHTML.cxx | |
| parent | 2570c57829a3577db3aa7323096fb14780b9147c (diff) | |
| download | scintilla-mirror-3ed550474301fa98e75c23d1f9c55763b296224e.tar.gz | |
Fix folding failure with PHP within a line of Javascript. Bug #3193530.
Diffstat (limited to 'lexers/LexHTML.cxx')
| -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; } ///////////////////////////////////// |