diff options
author | Valerio Virgillito | 2012-07-17 11:28:39 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-17 11:28:39 -0700 |
commit | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (patch) | |
tree | 212d164c0f83d80394e34f1df532ea0461ad328d /imports/codemirror/mode/ruby | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
parent | 0e04fff0ea80fa5cbe96b8354db38bd334aea83a (diff) | |
download | ninja-4f737b24c19ddc02d20f9783b8b080fc6ef11142.tar.gz |
Merge pull request #396 from ananyasen/codemirror2.3-upgrade
upgrade to codemirror 2.3
Diffstat (limited to 'imports/codemirror/mode/ruby')
-rw-r--r-- | imports/codemirror/mode/ruby/ruby.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/imports/codemirror/mode/ruby/ruby.js b/imports/codemirror/mode/ruby/ruby.js index b647efd0..74ed7b96 100644 --- a/imports/codemirror/mode/ruby/ruby.js +++ b/imports/codemirror/mode/ruby/ruby.js | |||
@@ -30,7 +30,7 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) { | |||
30 | return "comment"; | 30 | return "comment"; |
31 | } | 31 | } |
32 | if (stream.eatSpace()) return null; | 32 | if (stream.eatSpace()) return null; |
33 | var ch = stream.next(); | 33 | var ch = stream.next(), m; |
34 | if (ch == "`" || ch == "'" || ch == '"' || | 34 | if (ch == "`" || ch == "'" || ch == '"' || |
35 | (ch == "/" && !stream.eol() && stream.peek() != " ")) { | 35 | (ch == "/" && !stream.eol() && stream.peek() != " ")) { |
36 | return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state); | 36 | return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state); |
@@ -46,13 +46,8 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) { | |||
46 | } else if (ch == "#") { | 46 | } else if (ch == "#") { |
47 | stream.skipToEnd(); | 47 | stream.skipToEnd(); |
48 | return "comment"; | 48 | return "comment"; |
49 | } else if (ch == "<" && stream.eat("<")) { | 49 | } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) { |
50 | stream.eat("-"); | 50 | return chain(readHereDoc(m[1]), stream, state); |
51 | stream.eat(/[\'\"\`]/); | ||
52 | var match = stream.match(/^\w+/); | ||
53 | stream.eat(/[\'\"\`]/); | ||
54 | if (match) return chain(readHereDoc(match[0]), stream, state); | ||
55 | return null; | ||
56 | } else if (ch == "0") { | 51 | } else if (ch == "0") { |
57 | if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/); | 52 | if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/); |
58 | else if (stream.eat("b")) stream.eatWhile(/[01]/); | 53 | else if (stream.eat("b")) stream.eatWhile(/[01]/); |