summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/mode/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'public/vendor/codemirror/mode/ruby')
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/mode/ruby/index.html0
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/mode/ruby/ruby.js6
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/mode/ruby/test.js0
3 files changed, 3 insertions, 3 deletions
diff --git a/public/vendor/codemirror/mode/ruby/index.html b/public/vendor/codemirror/mode/ruby/index.html
index 97544bab..97544bab 100755..100644
--- a/public/vendor/codemirror/mode/ruby/index.html
+++ b/public/vendor/codemirror/mode/ruby/index.html
diff --git a/public/vendor/codemirror/mode/ruby/ruby.js b/public/vendor/codemirror/mode/ruby/ruby.js
index eab9d9da..10cad8d9 100755..100644
--- a/public/vendor/codemirror/mode/ruby/ruby.js
+++ b/public/vendor/codemirror/mode/ruby/ruby.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("ruby", function(config) {
"caller", "lambda", "proc", "public", "protected", "private", "require", "load",
"require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
]);
- var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then",
+ var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
"catch", "loop", "proc", "begin"]);
var dedentWords = wordObj(["end", "until"]);
var matching = {"[": "]", "{": "}", "(": ")"};
@@ -37,7 +37,6 @@ CodeMirror.defineMode("ruby", function(config) {
}
function tokenBase(stream, state) {
- curPunc = null;
if (stream.sol() && stream.match("=begin") && stream.eol()) {
state.tokenize.push(readBlockComment);
return "comment";
@@ -232,6 +231,7 @@ CodeMirror.defineMode("ruby", function(config) {
},
token: function(stream, state) {
+ curPunc = null;
if (stream.sol()) state.indented = stream.indentation();
var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
var thisTok = curPunc;
@@ -275,7 +275,7 @@ CodeMirror.defineMode("ruby", function(config) {
(state.continuedLine ? config.indentUnit : 0);
},
- electricChars: "}de", // enD and rescuE
+ electricInput: /^\s*(?:end|rescue|\})$/,
lineComment: "#"
};
});
diff --git a/public/vendor/codemirror/mode/ruby/test.js b/public/vendor/codemirror/mode/ruby/test.js
index cade864f..cade864f 100755..100644
--- a/public/vendor/codemirror/mode/ruby/test.js
+++ b/public/vendor/codemirror/mode/ruby/test.js