fix slow regexp in c9search when line contains \u2028 or \u2029

Author: nightwing

lib/ace/mode/c9search_highlight_rules.js

@@ -49,20 +49,26 @@ var C9SearchHighlightRules = function() {
         "start" : [
             {
                 tokenNames : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text", "c9searchresults.keyword"],
-                regex : "(^\\s+[0-9]+)(:\\s)(.+)",
+                regex : /(^\s+[0-9]+)(:)(\d*\s?)([^\r\n]+)/,
                 onMatch : function(val, state, stack) {
                     var values = this.splitRegex.exec(val);
                     var types = this.tokenNames;
                     var tokens = [{
                         type: types[0],
                         value: values[1]
-                    },{
+                    }, {
                         type: types[1],
                         value: values[2]
                     }];
 
+                    if (values[3]) {
+                        if (values[3] == " ")
+                            tokens[1] = { type: types[1], value: values[2] + " " };
+                        else
+                            tokens.push({ type: types[1], value: values[3] });
+                    }
                     var regex = stack[1];
-                    var str = values[3];
+                    var str = values[4];
 
                     var m;
                     var last = 0;
@@ -85,11 +91,7 @@ var C9SearchHighlightRules = function() {
                 }
             },
             {
-                token : ["string", "text"], // single line
-                regex : "(\\S.*)(:$)"
-            },
-            {
-                regex : "Searching for .*$",
+                regex : "^Searching for [^\\r\\n]*$",
                 onMatch: function(val, state, stack) {
                     var parts = val.split("\x01");
                     if (parts.length < 3)
@@ -168,11 +170,26 @@ var C9SearchHighlightRules = function() {
                 }
             },
             {
-                regex : "\\d+",
-                token: "constant.numeric"
+                regex : "^(?=Found \\d+ matches)",
+                token : "text",
+                next : "numbers"
+            },
+            {
+                token : "string", // single line
+                regex : "^\\S:?[^:]+",
+                next : "numbers"
             }
-        ]
+        ],
+        numbers:[{
+            regex : "\\d+",
+            token : "constant.numeric"
+        }, {
+            regex : "$",
+            token : "text",
+            next : "start"
+        }]
     };
+    this.normalizeRules();
 };
 
 oop.inherits(C9SearchHighlightRules, TextHighlightRules);

tool/mode_creator.js

@@ -203,7 +203,7 @@ function run() {
     src = src.replace("define(", 'define("' + path +'", ["require","exports","module",' + deps +'],');
     try {
         eval(src);
-        require(["ace/mode/new"], function(e) {
+        require([path], function(e) {
             try {
                 continueRun(e);
             } catch(e) {
@@ -228,7 +228,8 @@ var continueRun = function(rules) {
     }
     currentRules = new rules().getRules();
     var Tokenizer = DebugTokenizer;
-
+    var Mode = require(editor2.session.$mode.$id).Mode;
+    editor2.session.$mode = new Mode();
     var tk = new Tokenizer(currentRules);
     editor2.session.$mode.$tokenizer = tk;
     editor2.session.bgTokenizer.setTokenizer(tk);