aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/clike/clike.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-12 16:25:28 -0700
committerNivesh Rajbhandari2012-03-12 16:25:28 -0700
commit5fb358d9e80a364d5f300d60b7a9fe0f773741e7 (patch)
tree2c4d5292b19c91697dffb542f369ec9dcb340f77 /imports/codemirror/mode/clike/clike.js
parent5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-5fb358d9e80a364d5f300d60b7a9fe0f773741e7.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'imports/codemirror/mode/clike/clike.js')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/clike/clike.js19
1 files changed, 2 insertions, 17 deletions
diff --git a/imports/codemirror/mode/clike/clike.js b/imports/codemirror/mode/clike/clike.js
index 69877efd..66443fb8 100755..100644
--- a/imports/codemirror/mode/clike/clike.js
+++ b/imports/codemirror/mode/clike/clike.js
@@ -59,7 +59,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
59 escaped = !escaped && next == "\\"; 59 escaped = !escaped && next == "\\";
60 } 60 }
61 if (end || !(escaped || multiLineStrings)) 61 if (end || !(escaped || multiLineStrings))
62 state.tokenize = tokenBase; 62 state.tokenize = null;
63 return "string"; 63 return "string";
64 }; 64 };
65 } 65 }
@@ -68,7 +68,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
68 var maybeEnd = false, ch; 68 var maybeEnd = false, ch;
69 while (ch = stream.next()) { 69 while (ch = stream.next()) {
70 if (ch == "/" && maybeEnd) { 70 if (ch == "/" && maybeEnd) {
71 state.tokenize = tokenBase; 71 state.tokenize = null;
72 break; 72 break;
73 } 73 }
74 maybeEnd = (ch == "*"); 74 maybeEnd = (ch == "*");
@@ -231,19 +231,4 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
231 } 231 }
232 } 232 }
233 }); 233 });
234 CodeMirror.defineMIME("text/x-groovy", {
235 name: "clike",
236 keywords: words("abstract as assert boolean break byte case catch char class const continue def default " +
237 "do double else enum extends final finally float for goto if implements import " +
238 "in instanceof int interface long native new package property private protected public " +
239 "return short static strictfp super switch synchronized this throw throws transient " +
240 "try void volatile while"),
241 atoms: words("true false null"),
242 hooks: {
243 "@": function(stream, state) {
244 stream.eatWhile(/[\w\$_]/);
245 return "meta";
246 }
247 }
248 });
249}()); 234}());