Merge branch 'master' into pentool

1 files changed, 6 insertions, 3 deletions

diff --git a/imports/codemirror/lib/util/formatting.js b/imports/codemirror/lib/util/formatting.js
index 986bcb8f..15de0355 100755..100644
--- a/imports/codemirror/lib/util/formatting.js
+++ b/imports/codemirror/lib/util/formatting.js
@@ -4,7 +4,10 @@ if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {};
 
 // Returns the extension of the editor's current mode
 CodeMirror.defineExtension("getModeExt", function () {
-  return CodeMirror.modeExtensions[this.getOption("mode")];
+  var mname = CodeMirror.resolveMode(this.getOption("mode")).name;
+  var ext = CodeMirror.modeExtensions[mname];
+  if (!ext) throw new Error("No extensions found for mode " + mname);
+  return ext;
 });
 
 // If the current mode is 'htmlmixed', returns the extension of a mode located at
@@ -50,7 +53,7 @@ CodeMirror.defineExtension("autoIndentRange", function (from, to) {
   var cmInstance = this;
   this.operation(function () {
     for (var i = from.line; i <= to.line; i++) {
-      cmInstance.indentLine(i);
+      cmInstance.indentLine(i, "smart");
     }
   });
 });
@@ -70,7 +73,7 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) {
     var startLine = cmInstance.posFromIndex(absStart).line;
     var endLine = cmInstance.posFromIndex(absStart + res.length).line;
     for (var i = startLine; i <= endLine; i++) {
-      cmInstance.indentLine(i);
+      cmInstance.indentLine(i, "smart");
     }
   });
 });