[ruby mode] Fix state-copying bug

marijnh · marijnh · commit 62754f612abf · 2014-10-20T16:11:17.000+02:00
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
@@ -149,17 +149,18 @@ CodeMirror.defineMode("ruby", function(config) {
     }
   }
 
-  function tokenBaseUntilBrace() {
-    var depth = 1;
+  function tokenBaseUntilBrace(depth) {
+    if (!depth) depth = 1;
     return function(stream, state) {
       if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
+        if (depth == 1) {
           state.tokenize.pop();
           return state.tokenize[state.tokenize.length-1](stream, state);
+        } else {
+          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
         }
       } else if (stream.peek() == "{") {
-        depth++;
+        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
       }
       return tokenBase(stream, state);
     };

Original file line number	Diff line number	Diff line change
`@@ -149,17 +149,18 @@ CodeMirror.defineMode("ruby", function(config) {`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`152`		`- function tokenBaseUntilBrace() {`
`153`		`- var depth = 1;`
	`152`	`+ function tokenBaseUntilBrace(depth) {`
	`153`	`+ if (!depth) depth = 1;`
`154`	`154`	`return function(stream, state) {`
`155`	`155`	`if (stream.peek() == "}") {`
`156`		`- depth--;`
`157`		`- if (depth == 0) {`
	`156`	`+ if (depth == 1) {`
`158`	`157`	`state.tokenize.pop();`
`159`	`158`	`return state.tokenize[state.tokenize.length-1](stream, state);`
	`159`	`+ } else {`
	`160`	`+ state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);`
`160`	`161`	`}`
`161`	`162`	`} else if (stream.peek() == "{") {`
`162`		`- depth++;`
	`163`	`+ state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);`
`163`	`164`	`}`
`164`	`165`	`return tokenBase(stream, state);`
`165`	`166`	`};`