From c2805e03c84b6e598556fd06d1ede7aaeea7ce9c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 6 Mar 2012 16:17:54 -0800 Subject: 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 --- imports/codemirror/mode/clike/clike.js | 19 ++----------------- imports/codemirror/mode/clike/index.html | 2 +- 2 files changed, 3 insertions(+), 18 deletions(-) mode change 100755 => 100644 imports/codemirror/mode/clike/clike.js mode change 100755 => 100644 imports/codemirror/mode/clike/index.html (limited to 'imports/codemirror/mode/clike') diff --git a/imports/codemirror/mode/clike/clike.js b/imports/codemirror/mode/clike/clike.js old mode 100755 new mode 100644 index 69877efd..66443fb8 --- a/imports/codemirror/mode/clike/clike.js +++ b/imports/codemirror/mode/clike/clike.js @@ -59,7 +59,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) { escaped = !escaped && next == "\\"; } if (end || !(escaped || multiLineStrings)) - state.tokenize = tokenBase; + state.tokenize = null; return "string"; }; } @@ -68,7 +68,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) { var maybeEnd = false, ch; while (ch = stream.next()) { if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; + state.tokenize = null; break; } maybeEnd = (ch == "*"); @@ -231,19 +231,4 @@ CodeMirror.defineMode("clike", function(config, parserConfig) { } } }); - CodeMirror.defineMIME("text/x-groovy", { - name: "clike", - keywords: words("abstract as assert boolean break byte case catch char class const continue def default " + - "do double else enum extends final finally float for goto if implements import " + - "in instanceof int interface long native new package property private protected public " + - "return short static strictfp super switch synchronized this throw throws transient " + - "try void volatile while"), - atoms: words("true false null"), - hooks: { - "@": function(stream, state) { - stream.eatWhile(/[\w\$_]/); - return "meta"; - } - } - }); }()); diff --git a/imports/codemirror/mode/clike/index.html b/imports/codemirror/mode/clike/index.html old mode 100755 new mode 100644 index 5e375ef4..5c327451 --- 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) {

MIME types defined: text/x-csrc (C code), text/x-c++src (C++ code), text/x-java (Java - code), text/x-groovy (Groovy code).

+ code).

-- cgit v1.2.3