aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/ruby/ruby.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-06 17:04:40 -0800
committerPushkar Joshi2012-03-06 17:04:40 -0800
commit7a43958033906b2273de88bc2a26cda7a905d202 (patch)
treef71817e712c4b07a48257a4f0b206cf9033421df /imports/codemirror/mode/ruby/ruby.js
parent264e3d8e6d3624083d2fab9fe2560234553bb2ad (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-7a43958033906b2273de88bc2a26cda7a905d202.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/ruby/ruby.js')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/mode/ruby/ruby.js17
1 files changed, 11 insertions, 6 deletions
diff --git a/imports/codemirror/mode/ruby/ruby.js b/imports/codemirror/mode/ruby/ruby.js
index ddc1a654..b647efd0 100755..100644
--- a/imports/codemirror/mode/ruby/ruby.js
+++ b/imports/codemirror/mode/ruby/ruby.js
@@ -13,7 +13,7 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
13 "require_relative", "extend", "autoload" 13 "require_relative", "extend", "autoload"
14 ]); 14 ]);
15 var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then", 15 var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then",
16 "unless", "catch", "loop", "proc"]); 16 "catch", "loop", "proc", "begin"]);
17 var dedentWords = wordObj(["end", "until"]); 17 var dedentWords = wordObj(["end", "until"]);
18 var matching = {"[": "]", "{": "}", "(": ")"}; 18 var matching = {"[": "]", "{": "}", "(": ")"};
19 var curPunc; 19 var curPunc;
@@ -31,8 +31,9 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
31 } 31 }
32 if (stream.eatSpace()) return null; 32 if (stream.eatSpace()) return null;
33 var ch = stream.next(); 33 var ch = stream.next();
34 if (ch == "`" || ch == "'" || ch == '"' || ch == "/") { 34 if (ch == "`" || ch == "'" || ch == '"' ||
35 return chain(readQuoted(ch, "string", ch == '"'), stream, state); 35 (ch == "/" && !stream.eol() && stream.peek() != " ")) {
36 return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
36 } else if (ch == "%") { 37 } else if (ch == "%") {
37 var style, embed = false; 38 var style, embed = false;
38 if (stream.eat("s")) style = "atom"; 39 if (stream.eat("s")) style = "atom";
@@ -165,7 +166,8 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
165 : "variable"; 166 : "variable";
166 if (indentWords.propertyIsEnumerable(word)) kwtype = "indent"; 167 if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
167 else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent"; 168 else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
168 else if (word == "if" && stream.column() == stream.indentation()) kwtype = "indent"; 169 else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
170 kwtype = "indent";
169 } 171 }
170 if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style; 172 if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
171 if (curPunc == "|") state.varList = !state.varList; 173 if (curPunc == "|") state.varList = !state.varList;
@@ -185,11 +187,14 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
185 var firstChar = textAfter && textAfter.charAt(0); 187 var firstChar = textAfter && textAfter.charAt(0);
186 var ct = state.context; 188 var ct = state.context;
187 var closing = ct.type == matching[firstChar] || 189 var closing = ct.type == matching[firstChar] ||
188 ct.type == "keyword" && /^(?:end|until|else|elsif|when)\b/.test(textAfter); 190 ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
189 return ct.indented + (closing ? 0 : config.indentUnit) + 191 return ct.indented + (closing ? 0 : config.indentUnit) +
190 (state.continuedLine ? config.indentUnit : 0); 192 (state.continuedLine ? config.indentUnit : 0);
191 } 193 },
194 electricChars: "}de" // enD and rescuE
195
192 }; 196 };
193}); 197});
194 198
195CodeMirror.defineMIME("text/x-ruby", "ruby"); 199CodeMirror.defineMIME("text/x-ruby", "ruby");
200