Updates to c9 highlighing

.gitignore

@@ -7,6 +7,7 @@
 .project
 .settings/
 .settings.xml
+.settings
 .c9settings.xml
 .c9revisions
 .settings.xml.old

demo/kitchen-sink/demo.js

@@ -90,6 +90,7 @@ Mode.prototype.supportsFile = function(filename) {
 };
 
 var modesByName = {
+    c9search:   ["C9Search"     , "c9search_results"],
     coffee:     ["CoffeeScript" , "coffee|^Cakefile"],
     coldfusion: ["ColdFusion"   , "cfm"],
     csharp:     ["C#"           , "cs"],
@@ -166,6 +167,7 @@ function makeHuge(txt) {
 }
 
 var docs = {
+    "docs/c9search.c9search_results": "C9 Search Results",
     "docs/javascript.js": "JavaScript",
     "docs/plaintext.txt": {name: "Plain Text", prepare: makeHuge, wrapped: true},
     "docs/coffeescript.coffee": "Coffeescript",

demo/kitchen-sink/docs/c9search.c9search_results

@@ -0,0 +1,25 @@
+Searching for 'var' in /workspace/configs
+
+configs/default.js:
+    1: var fs = require("fs");
+	2: var argv = require('optimist').argv;
+	3: var path = require("path");
+	5: var clientExtensions = {};
+	6: var clientDirs = fs.readdirSync(__dirname + "/../plugins-client");
+	7: for (var i = 0; i < clientDirs.length; i++) {
+	8:     var dir = clientDirs[i];
+	12:     var name = dir.split(".")[1];
+	16: var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd();
+	17: var fsUrl = "/workspace";
+	19: var port = argv.p || process.env.PORT || 3131;
+	20: var host = argv.l || "localhost";
+	22: var config = {
+
+configs/local.js:
+	2: var config = require("./default");
+
+configs/packed.js:
+	1: var config = require("./default");
+
+
+Found 15 matches in 3 files

lib/ace/mode/c9search_highlight_rules.js

@@ -48,7 +48,7 @@ var C9SearchHighlightRules = function() {
     this.$rules = {
         "start" : [
             {
-                token : ["constant.numeric", "text", "text"],
+                token : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text"],
                 regex : "(^\\s+[0-9]+)(:\\s*)(.+)"
             },
             {

lib/ace/mode/folding/c9search.js

@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Garen J. Torikian <gjtorikian AT gmail DOT com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or

lib/ace/theme/clouds.css

@@ -45,7 +45,7 @@
 }
 
 .ace-clouds .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-clouds .ace_marker-layer .ace_bracket {
@@ -117,3 +117,7 @@
 .ace-clouds .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-clouds span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/clouds_midnight.css

@@ -45,7 +45,7 @@
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_bracket {
@@ -118,3 +118,7 @@ background-color:#E92E2E;
 .ace-clouds-midnight .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-clouds-midnight span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/cobalt.css

@@ -45,7 +45,7 @@
 }
 
 .ace-cobalt .ace_marker-layer .ace_step {
-  background: rgb(127, 111, 19);
+  background: rgb(198, 219, 174);
 }
 
 .ace-cobalt .ace_marker-layer .ace_bracket {
@@ -144,3 +144,7 @@ background-color:#001221;
 .ace-cobalt .ace_markup.ace_list {
   background-color:#130D26;
 }
+
+.ace-cobalt span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/dawn.css

@@ -45,7 +45,7 @@
 }
 
 .ace-dawn .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-dawn .ace_marker-layer .ace_bracket {
@@ -148,3 +148,7 @@ color:#5A525F;
 .ace-dawn .ace_markup.ace_list {
   color:#693A17;
 }
+
+.ace-dawn span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/idle_fingers.css

@@ -45,7 +45,7 @@
 }
 
 .ace-idle-fingers .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-idle-fingers .ace_marker-layer .ace_bracket {
@@ -136,3 +136,7 @@ color:#BC9458;
   color:#323232;
 background-color:#FFF980;
 }
+
+.ace-idle-fingers span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/kr_theme.css

@@ -45,7 +45,7 @@
 }
 
 .ace-kr-theme .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-kr-theme .ace_marker-layer .ace_bracket {
@@ -139,3 +139,7 @@ color:#706D5B;
 .ace-kr-theme .ace_markup.ace_list {
   background-color:#0F0040;
 }
+
+.ace-kr-theme span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/merbivore.css

@@ -45,7 +45,7 @@
 }
 
 .ace-merbivore .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-merbivore .ace_marker-layer .ace_bracket {
@@ -139,3 +139,7 @@ color:#AD2EA4;
 .ace-merbivore .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-merbivore span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/merbivore_soft.css

@@ -45,7 +45,7 @@
 }
 
 .ace-merbivore-soft .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-merbivore-soft .ace_marker-layer .ace_bracket {
@@ -145,3 +145,7 @@ color:#AC4BB8;
 .ace-merbivore-soft .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-merbivore-soft span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/mono_industrial.css

@@ -45,7 +45,7 @@
 }
 
 .ace-mono-industrial .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-mono-industrial .ace_marker-layer .ace_bracket {
@@ -147,3 +147,7 @@ background-color:#151C19;
 .ace-mono-industrial .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-mono-industrial span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/monokai.css

@@ -8,8 +8,8 @@
 }
 
 .ace-monokai .ace_gutter {
-  background: #292a24;
+  background: #e8e8e8;
-  color: #f1f1f1;
+  color: #333;
 }
 
 .ace-monokai .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-monokai .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-monokai .ace_marker-layer .ace_bracket {
@@ -56,8 +56,9 @@
 .ace-monokai .ace_marker-layer .ace_active_line {
   background: #49483E;
 }
+
 .ace-monokai .ace_gutter_active_line {
-  background-color: #191916;
+  background-color : #dcdcdc;
 }
 
 .ace-monokai .ace_marker-layer .ace_selected_word {
@@ -144,3 +145,7 @@ color:#FD971F;
 .ace-monokai .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-monokai span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/pastel_on_dark.css

@@ -45,7 +45,7 @@
 }
 
 .ace-pastel-on-dark .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-pastel-on-dark .ace_marker-layer .ace_bracket {
@@ -149,3 +149,7 @@ color:#D2A8A1;
 .ace-pastel-on-dark .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-pastel-on-dark span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/solarized_dark.css

@@ -8,8 +8,8 @@
 }
 
 .ace-solarized-dark .ace_gutter {
-  background: #09222b;
+  background: #e8e8e8;
-  color: #d0edf7;
+  color: #333;
 }
 
 .ace-solarized-dark .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_bracket {
@@ -58,7 +58,7 @@
 }
 
 .ace-solarized-dark .ace_gutter_active_line {
-  background-color: #0d3440;
+  background-color : #dcdcdc;
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_selected_word {
@@ -130,3 +130,7 @@ color:#657B83;
 .ace-solarized-dark .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-solarized-dark span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/solarized_light.css

@@ -45,7 +45,7 @@
 }
 
 .ace-solarized-light .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-solarized-light .ace_marker-layer .ace_bracket {
@@ -129,3 +129,7 @@
 .ace-solarized-light .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-solarized-light span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/tomorrow.css

@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow .ace_marker-layer .ace_bracket {
@@ -163,3 +163,7 @@ background-color:#8959A8;
 .ace-tomorrow .ace_markup.ace_heading {
   color:#718C00;
 }
+
+.ace-tomorrow span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/tomorrow_night.css

@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night .ace_marker-layer .ace_bracket {
@@ -163,3 +163,7 @@ background-color:#B798BF;
 .ace-tomorrow-night .ace_markup.ace_heading {
   color:#B5BD68;
 }
+
+.ace-tomorrow-night span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/tomorrow_night_blue.css

@@ -8,8 +8,8 @@
 }
 
 .ace-tomorrow-night-blue .ace_gutter {
-  background: #022346;
+  background: #e8e8e8;
-  color: #7388b5;
+  color: #333;
 }
 
 .ace-tomorrow-night-blue .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_step {
-  background: rgb(127, 111, 19);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {
@@ -58,7 +58,7 @@
 }
 
 .ace-tomorrow-night-blue .ace_gutter_active_line {
-  background-color: #022040;
+  background-color : #dcdcdc;
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {
@@ -163,3 +163,7 @@ background-color:#EBBBFF;
 .ace-tomorrow-night-blue .ace_markup.ace_heading {
   color:#D1F1A9;
 }
+
+.ace-tomorrow-night-blue span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/tomorrow_night_bright.css

@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-bright .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {
@@ -163,3 +163,7 @@ background-color:#B798BF;
 .ace-tomorrow-night-bright .ace_markup.ace_heading {
   color:#B9CA4A;
 }
+
+.ace-tomorrow-night-bright span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/tomorrow_night_eighties.css

@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {
@@ -159,3 +159,7 @@ background-color:#CC99CC;
 .ace-tomorrow-night-eighties .ace_markup.ace_heading {
   color:#99CC99;
 }
+
+.ace-tomorrow-night-eighties span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/twilight.css

@@ -45,7 +45,7 @@
 }
 
 .ace-twilight .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-twilight .ace_marker-layer .ace_bracket {
@@ -161,3 +161,7 @@ color:#5F5A60;
 .ace-twilight .ace_markup.ace_list {
   color:#F9EE98;
 }
+
+.ace-twilight span.ace_c9searchresults {
+    cursor: pointer;
+}

lib/ace/theme/vibrant_ink.css

@@ -45,7 +45,7 @@
 }
 
 .ace-vibrant-ink .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-vibrant-ink .ace_marker-layer .ace_bracket {
@@ -140,3 +140,7 @@ color:#99CC99;
 .ace-vibrant-ink .ace_markup.ace_underline {
     text-decoration:underline;
 }
+
+.ace-vibrant-ink span.ace_c9searchresults {
+    cursor: pointer;
+}

tool/Theme.tmpl.css

@@ -249,3 +249,7 @@
 .%cssClass% .ace_collab.ace_user1 {
   %collab.user1%
 }
+
+.%cssClass% span.ace_c9searchresults {
+    cursor: pointer;
+}

tool/tmtheme.js

@@ -32,6 +32,8 @@ var supportedScopes = {
    "function": "function",
    "function.buildin": "function.buildin",
 
+   "c9searchresults": "c9searchresults",
+   
    "storage": "storage",
    "storage.type": "storage.type",