jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #804 from ajaxorg/fix/search_ui

Browse source 
Updates to c9 highlighing for search results
This commit is contained in:
Ruben Daniels 2012-06-19 02:25:18 -07:00
commit 13d5d54faf
26 changed files with 62 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

2
demo/kitchen-sink/demo.js
View file

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

25
demo/kitchen-sink/docs/c9search.c9search_results Normal file
View file

@ -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

2
lib/ace/mode/c9search_highlight_rules.js
View file

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

2
lib/ace/mode/folding/c9search.js
View file

@ -19,7 +19,7 @@
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * 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 * 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 * either the GNU General Public License Version 2 or later (the "GPL"), or

2
lib/ace/theme/clouds.css
View file

@ -45,7 +45,7 @@
} }
.ace-clouds .ace_marker-layer .ace_step { .ace-clouds .ace_marker-layer .ace_step {
background: rgb(255, 255, 0); background: rgb(198, 219, 174);
} }
.ace-clouds .ace_marker-layer .ace_bracket { .ace-clouds .ace_marker-layer .ace_bracket {

2
lib/ace/theme/clouds_midnight.css
View file

@ -45,7 +45,7 @@
} }
.ace-clouds-midnight .ace_marker-layer .ace_step { .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 { .ace-clouds-midnight .ace_marker-layer .ace_bracket {

2
lib/ace/theme/cobalt.css
View file

@ -45,7 +45,7 @@
} }
.ace-cobalt .ace_marker-layer .ace_step { .ace-cobalt .ace_marker-layer .ace_step {
background: rgb(127, 111, 19); background: rgb(198, 219, 174);
} }
.ace-cobalt .ace_marker-layer .ace_bracket { .ace-cobalt .ace_marker-layer .ace_bracket {

2
lib/ace/theme/dawn.css
View file

@ -45,7 +45,7 @@
} }
.ace-dawn .ace_marker-layer .ace_step { .ace-dawn .ace_marker-layer .ace_step {
background: rgb(255, 255, 0); background: rgb(198, 219, 174);
} }
.ace-dawn .ace_marker-layer .ace_bracket { .ace-dawn .ace_marker-layer .ace_bracket {

2
lib/ace/theme/idle_fingers.css
View file

@ -45,7 +45,7 @@
} }
.ace-idle-fingers .ace_marker-layer .ace_step { .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 { .ace-idle-fingers .ace_marker-layer .ace_bracket {

2
lib/ace/theme/kr_theme.css
View file

@ -45,7 +45,7 @@
} }
.ace-kr-theme .ace_marker-layer .ace_step { .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 { .ace-kr-theme .ace_marker-layer .ace_bracket {

2
lib/ace/theme/merbivore.css
View file

@ -45,7 +45,7 @@
} }
.ace-merbivore .ace_marker-layer .ace_step { .ace-merbivore .ace_marker-layer .ace_step {
background: rgb(102, 82, 0); background: rgb(198, 219, 174);
} }
.ace-merbivore .ace_marker-layer .ace_bracket { .ace-merbivore .ace_marker-layer .ace_bracket {

2
lib/ace/theme/merbivore_soft.css
View file

@ -45,7 +45,7 @@
} }
.ace-merbivore-soft .ace_marker-layer .ace_step { .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 { .ace-merbivore-soft .ace_marker-layer .ace_bracket {

2
lib/ace/theme/mono_industrial.css
View file

@ -45,7 +45,7 @@
} }
.ace-mono-industrial .ace_marker-layer .ace_step { .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 { .ace-mono-industrial .ace_marker-layer .ace_bracket {

9
lib/ace/theme/monokai.css
View file

@ -8,8 +8,8 @@
} }
.ace-monokai .ace_gutter { .ace-monokai .ace_gutter {
background: #292a24; background: #e8e8e8;
color: #f1f1f1; color: #333;
} }
.ace-monokai .ace_print_margin { .ace-monokai .ace_print_margin {
@ -45,7 +45,7 @@
} }
.ace-monokai .ace_marker-layer .ace_step { .ace-monokai .ace_marker-layer .ace_step {
background: rgb(102, 82, 0); background: rgb(198, 219, 174);
} }
.ace-monokai .ace_marker-layer .ace_bracket { .ace-monokai .ace_marker-layer .ace_bracket {
@ -56,8 +56,9 @@
.ace-monokai .ace_marker-layer .ace_active_line { .ace-monokai .ace_marker-layer .ace_active_line {
background: #49483E; background: #49483E;
} }
.ace-monokai .ace_gutter_active_line { .ace-monokai .ace_gutter_active_line {
background-color: #191916; background-color : #dcdcdc;
} }
.ace-monokai .ace_marker-layer .ace_selected_word { .ace-monokai .ace_marker-layer .ace_selected_word {

2
lib/ace/theme/pastel_on_dark.css
View file

@ -45,7 +45,7 @@
} }
.ace-pastel-on-dark .ace_marker-layer .ace_step { .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 { .ace-pastel-on-dark .ace_marker-layer .ace_bracket {

8
lib/ace/theme/solarized_dark.css
View file

@ -8,8 +8,8 @@
} }
.ace-solarized-dark .ace_gutter { .ace-solarized-dark .ace_gutter {
background: #09222b; background: #e8e8e8;
color: #d0edf7; color: #333;
} }
.ace-solarized-dark .ace_print_margin { .ace-solarized-dark .ace_print_margin {
@ -45,7 +45,7 @@
} }
.ace-solarized-dark .ace_marker-layer .ace_step { .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 { .ace-solarized-dark .ace_marker-layer .ace_bracket {
@ -58,7 +58,7 @@
} }
.ace-solarized-dark .ace_gutter_active_line { .ace-solarized-dark .ace_gutter_active_line {
background-color: #0d3440; background-color : #dcdcdc;
} }
.ace-solarized-dark .ace_marker-layer .ace_selected_word { .ace-solarized-dark .ace_marker-layer .ace_selected_word {

2
lib/ace/theme/solarized_light.css
View file

@ -45,7 +45,7 @@
} }
.ace-solarized-light .ace_marker-layer .ace_step { .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 { .ace-solarized-light .ace_marker-layer .ace_bracket {

2
lib/ace/theme/tomorrow.css
View file

@ -45,7 +45,7 @@
} }
.ace-tomorrow .ace_marker-layer .ace_step { .ace-tomorrow .ace_marker-layer .ace_step {
background: rgb(255, 255, 0); background: rgb(198, 219, 174);
} }
.ace-tomorrow .ace_marker-layer .ace_bracket { .ace-tomorrow .ace_marker-layer .ace_bracket {

2
lib/ace/theme/tomorrow_night.css
View file

@ -45,7 +45,7 @@
} }
.ace-tomorrow-night .ace_marker-layer .ace_step { .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 { .ace-tomorrow-night .ace_marker-layer .ace_bracket {

8
lib/ace/theme/tomorrow_night_blue.css
View file

@ -8,8 +8,8 @@
} }
.ace-tomorrow-night-blue .ace_gutter { .ace-tomorrow-night-blue .ace_gutter {
background: #022346; background: #e8e8e8;
color: #7388b5; color: #333;
} }
.ace-tomorrow-night-blue .ace_print_margin { .ace-tomorrow-night-blue .ace_print_margin {
@ -45,7 +45,7 @@
} }
.ace-tomorrow-night-blue .ace_marker-layer .ace_step { .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 { .ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {
@ -58,7 +58,7 @@
} }
.ace-tomorrow-night-blue .ace_gutter_active_line { .ace-tomorrow-night-blue .ace_gutter_active_line {
background-color: #022040; background-color : #dcdcdc;
} }
.ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word { .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {

2
lib/ace/theme/tomorrow_night_bright.css
View file

@ -45,7 +45,7 @@
} }
.ace-tomorrow-night-bright .ace_marker-layer .ace_step { .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 { .ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {

2
lib/ace/theme/tomorrow_night_eighties.css
View file

@ -45,7 +45,7 @@
} }
.ace-tomorrow-night-eighties .ace_marker-layer .ace_step { .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 { .ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {

2
lib/ace/theme/twilight.css
View file

@ -45,7 +45,7 @@
} }
.ace-twilight .ace_marker-layer .ace_step { .ace-twilight .ace_marker-layer .ace_step {
background: rgb(102, 82, 0); background: rgb(198, 219, 174);
} }
.ace-twilight .ace_marker-layer .ace_bracket { .ace-twilight .ace_marker-layer .ace_bracket {

2
lib/ace/theme/vibrant_ink.css
View file

@ -45,7 +45,7 @@
} }
.ace-vibrant-ink .ace_marker-layer .ace_step { .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 { .ace-vibrant-ink .ace_marker-layer .ace_bracket {

2
tool/tmtheme.js
View file

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