aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2013-02-23 10:13:58 +1100
committernyamatongwe <devnull@localhost>2013-02-23 10:13:58 +1100
commitd8482166650ce7d6a2e2cabf44a73600fe8a39ef (patch)
treee41d4cacd1ef8435a66a9532d15ca09bdf0cf5cb
parentacc4befe546b75cf40385048849a5ef51503b13b (diff)
downloadscintilla-mirror-d8482166650ce7d6a2e2cabf44a73600fe8a39ef.tar.gz
Bug: [#1447]. Interpret PHP within HTML comments.
-rw-r--r--lexers/LexHTML.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx
index d7a1bb913..3793b1185 100644
--- a/lexers/LexHTML.cxx
+++ b/lexers/LexHTML.cxx
@@ -895,13 +895,12 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
!isPHPStringState(state) &&
(state != SCE_HPHP_COMMENT) &&
(state != SCE_HPHP_COMMENTLINE) &&
- (state != SCE_H_COMMENT) &&
(ch == '<') &&
(chNext == '?') &&
!IsScriptCommentState(state)) {
beforeLanguage = scriptLanguage;
scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, isXml ? eScriptXML : eScriptPHP);
- if (scriptLanguage != eScriptPHP && isStringState(state)) continue;
+ if ((scriptLanguage != eScriptPHP) && (isStringState(state) || (state==SCE_H_COMMENT))) continue;
styler.ColourTo(i - 1, StateToPrint);
beforePreProc = state;
i++;