aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/lib/util/formatting.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-07 10:32:20 -0800
committerNivesh Rajbhandari2012-03-07 10:32:20 -0800
commitf5b0162a9b148589f0ccc65a0332695ea6fd6be3 (patch)
treee62ae1bc8a14dfa60cca05d40227c13dbfa2746a /imports/codemirror/lib/util/formatting.js
parent443a23289171bb72324e740d8eaa041968a1de99 (diff)
parentcef07085443b7c31e878daaad083b7408c57e104 (diff)
downloadninja-f5b0162a9b148589f0ccc65a0332695ea6fd6be3.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'imports/codemirror/lib/util/formatting.js')
-rw-r--r--[-rwxr-xr-x]imports/codemirror/lib/util/formatting.js9
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 = {};
4 4
5// Returns the extension of the editor's current mode 5// Returns the extension of the editor's current mode
6CodeMirror.defineExtension("getModeExt", function () { 6CodeMirror.defineExtension("getModeExt", function () {
7 return CodeMirror.modeExtensions[this.getOption("mode")]; 7 var mname = CodeMirror.resolveMode(this.getOption("mode")).name;
8 var ext = CodeMirror.modeExtensions[mname];
9 if (!ext) throw new Error("No extensions found for mode " + mname);
10 return ext;
8}); 11});
9 12
10// If the current mode is 'htmlmixed', returns the extension of a mode located at 13// If the current mode is 'htmlmixed', returns the extension of a mode located at
@@ -50,7 +53,7 @@ CodeMirror.defineExtension("autoIndentRange", function (from, to) {
50 var cmInstance = this; 53 var cmInstance = this;
51 this.operation(function () { 54 this.operation(function () {
52 for (var i = from.line; i <= to.line; i++) { 55 for (var i = from.line; i <= to.line; i++) {
53 cmInstance.indentLine(i); 56 cmInstance.indentLine(i, "smart");
54 } 57 }
55 }); 58 });
56}); 59});
@@ -70,7 +73,7 @@ CodeMirror.defineExtension("autoFormatRange", function (from, to) {
70 var startLine = cmInstance.posFromIndex(absStart).line; 73 var startLine = cmInstance.posFromIndex(absStart).line;
71 var endLine = cmInstance.posFromIndex(absStart + res.length).line; 74 var endLine = cmInstance.posFromIndex(absStart + res.length).line;
72 for (var i = startLine; i <= endLine; i++) { 75 for (var i = startLine; i <= endLine; i++) {
73 cmInstance.indentLine(i); 76 cmInstance.indentLine(i, "smart");
74 } 77 }
75 }); 78 });
76}); 79});