diff options
author | Valerio Virgillito | 2012-03-06 16:17:54 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-03-06 16:17:54 -0800 |
commit | c2805e03c84b6e598556fd06d1ede7aaeea7ce9c (patch) | |
tree | b033421762f5e0fedbc8700bfc1f175c7c5cabcf /imports/codemirror/mode | |
parent | 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f (diff) | |
download | ninja-c2805e03c84b6e598556fd06d1ede7aaeea7ce9c.tar.gz |
Squashed commit FileIO-Build-Candidate into Master
Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'imports/codemirror/mode')
91 files changed, 2294 insertions, 223 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 | }()); |
diff --git a/imports/codemirror/mode/clike/index.html b/imports/codemirror/mode/clike/index.html index 5e375ef4..5c327451 100755..100644 --- a/imports/codemirror/mode/clike/index.html +++ b/imports/codemirror/mode/clike/index.html | |||
@@ -96,6 +96,6 @@ void* zmq_thread_init(void* zmq_context, int signal_fd) { | |||
96 | <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> | 96 | <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> |
97 | (C code), <code>text/x-c++src</code> (C++ | 97 | (C code), <code>text/x-c++src</code> (C++ |
98 | code), <code>text/x-java</code> (Java | 98 | code), <code>text/x-java</code> (Java |
99 | code), <code> |