Merge pull request ajaxorg#2583 from microtony/fix2250

Fixes ajaxorg#2550 empty line comment continued
chenxin0723 · Jul 1, 2015 · 44b1743 · 44b1743
2 parents 27240fb + 17f33b4
commit 44b1743
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/demo/kitchen-sink/docs/c_cpp.cpp b/demo/kitchen-sink/docs/c_cpp.cpp
@@ -24,10 +24,12 @@
 
 using namespace std;
 
+//
 int main ()
 {
     int a, b=3; /* foobar */
-    a = b;
+    a = b; // single line comment\
+        continued
     a+=2; // equivalent to a=a+2
     cout << a;
     #if VERBOSE >= 2

diff --git a/lib/ace/mode/_test/tokens_c_cpp.json b/lib/ace/mode/_test/tokens_c_cpp.json
@@ -81,6 +81,9 @@
   ["punctuation.operator",";"]
 ],[
    "start"
+],[
+   "start",
+   ["comment","//"]
 ],[
    "start",
   ["storage.type","int"],
@@ -114,7 +117,9 @@
   ["keyword.operator","="],
   ["text"," "],
   ["identifier","b"],
-  ["punctuation.operator",";"]
+  ["punctuation.operator",";"],
+  ["text"," "],
+  ["comment","// single line comment\\        continued"]
 ],[
    "start",
   ["text","    "],

diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js
@@ -53,6 +53,10 @@ var c_cppHighlightRules = function() {
     this.$rules = { 
         "start" : [
             {
+                token : "comment",
+                regex : "//$",
+                next : "start"
+            }, {
                 token : "comment",
                 regex : "//",
                 next : "singleLineComment"