[r mode] Fix bad post-'else if' indentation.

zenorocha · Dec 11, 2013 · 5deae0c · 5deae0c
1 parent efe9509
commit 5deae0c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mode/r/r.js b/mode/r/r.js
@@ -36,7 +36,11 @@ CodeMirror.defineMode("r", function(config) {
       var word = stream.current();
       if (atoms.propertyIsEnumerable(word)) return "atom";
       if (keywords.propertyIsEnumerable(word)) {
-        if (blockkeywords.propertyIsEnumerable(word)) curPunc = "block";
+        // Block keywords start new blocks, except 'else if', which only starts
+        // one new block for the 'if', no block for the 'else'.
+        if (blockkeywords.propertyIsEnumerable(word) &&
+            !stream.match(/\s*if(\s+|$)/, false))
+          curPunc = "block";
         return "keyword";
       }
       if (builtins.propertyIsEnumerable(word)) return "builtin";