aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2012-04-21 21:01:08 +1000
committernyamatongwe <unknown>2012-04-21 21:01:08 +1000
commit659b3cb21411f82056b9d73ebe5a2d4fee3ce5ae (patch)
treebd9d70fea0e27cc4650668685458424d08be9f38
parent0c30f9e7b9699ff1cb27cb30ef1ba90e74b98a03 (diff)
downloadscintilla-mirror-659b3cb21411f82056b9d73ebe5a2d4fee3ce5ae.tar.gz
Fix problem with JavaScript /*/ which starts a comment. Bug #3520032.
-rw-r--r--lexers/LexHTML.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx
index a22a675a5..9ebca16f8 100644
--- a/lexers/LexHTML.cxx
+++ b/lexers/LexHTML.cxx
@@ -1584,6 +1584,10 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
state = SCE_HJ_COMMENTDOC;
else
state = SCE_HJ_COMMENT;
+ if (chNext2 == '/') {
+ // Eat the * so it isn't used for the end of the comment
+ i++;
+ }
} else if (ch == '/' && chNext == '/') {
styler.ColourTo(i - 1, StateToPrint);
state = SCE_HJ_COMMENTLINE;