From ca97c230f099ceb89df28aa72078db8e5d2ff723 Mon Sep 17 00:00:00 2001 From: DanyaPostfactum Date: Sat, 29 Jun 2013 17:41:16 +1000 Subject: [PATCH] Proper comment rules in js syntax. --- lib/ace/mode/javascript_highlight_rules.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 35255c68..f950da89 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -86,7 +86,8 @@ var JavaScriptHighlightRules = function() { "no_regex" : [ { token : "comment", - regex : /\/\/.*$/ + regex : "\\/\\/", + next : "line_comment" }, DocCommentHighlightRules.getStartRule("doc-start"), { @@ -216,7 +217,7 @@ var JavaScriptHighlightRules = function() { }, { token : "comment", regex : "\\/\\/", - next : "line_comment" + next : "line_comment_regex_allowed" }, { token: "string.regexp", regex: "\\/", @@ -309,8 +310,12 @@ var JavaScriptHighlightRules = function() { {token : "comment", regex : "\\*\\/", next : "no_regex"}, {defaultToken : "comment"} ], + "line_comment_regex_allowed" : [ + {token : "comment", regex : "$|^", next : "start"}, + {defaultToken : "comment"} + ], "line_comment" : [ - {token : "comment", regex : "$", next : "start"}, + {token : "comment", regex : "$|^", next : "no_regex"}, {defaultToken : "comment"} ], "qqstring" : [