codemirror-rails 2.33 → 2.34

data/vendor/assets/javascripts/codemirror/modes/tiki.js

@@ -301,13 +301,6 @@ CodeMirror.defineMode('tiki', function(config, parserConfig) {
 			if (context) return context.indent + indentUnit;
 			else return 0;
 		},
-		compareStates: function(a, b) {
-			if (a.indented != b.indented || a.pluginName != b.pluginName) return false;
-			for (var ca = a.context, cb = b.context; ; ca = ca.prev, cb = cb.prev) {
-				if (!ca || !cb) return ca == cb;
-				if (ca.pluginName != cb.pluginName) return false;
-			}
-		},
 		electricChars: "/"
 	};
 });

data/vendor/assets/javascripts/codemirror/modes/vb.js

@@ -12,8 +12,8 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
     var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
 
-    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property'];
-    var middleKeywords = ['else','elseif','case'];
+    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
+    var middleKeywords = ['else','elseif','case', 'catch'];
     var endKeywords = ['next','loop'];
    
     var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'in']);

data/vendor/assets/javascripts/codemirror/modes/xml.js

@@ -308,14 +308,6 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       else return 0;
     },
 
-    compareStates: function(a, b) {
-      if (a.indented != b.indented || a.tokenize != b.tokenize) return false;
-      for (var ca = a.context, cb = b.context; ; ca = ca.prev, cb = cb.prev) {
-        if (!ca || !cb) return ca == cb;
-        if (ca.tagName != cb.tagName || ca.indent != cb.indent) return false;
-      }
-    },
-
     electricChars: "/"
   };
 });

data/vendor/assets/javascripts/codemirror/utils/closetag.js

@@ -26,6 +26,11 @@
 	/** Array of tag names where an end tag is forbidden. */
 	CodeMirror.defaults['closeTagVoid'] = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
+	function innerState(cm, state) {
+		return CodeMirror.innerMode(cm.getMode(), state).state;
+	}
+
+
 	/**
 	 * Call during key processing to close tags.  Handles the key event if the tag is closed, otherwise throws CodeMirror.Pass.
 	 * - cm: The editor instance.
@@ -39,40 +44,34 @@
 			throw CodeMirror.Pass;
 		}
 		
-		var mode = cm.getOption('mode');
-		
-		if (mode == 'text/html' || mode == 'xml') {
+		/*
+		 * Relevant structure of token:
+		 *
+		 * htmlmixed
+		 * 		className
+		 * 		state
+		 * 			htmlState
+		 * 				type
+		 *				tagName
+		 * 				context
+		 * 					tagName
+		 * 			mode
+		 * 
+		 * xml
+		 * 		className
+		 * 		state
+		 * 			tagName
+		 * 			type
+		 */
 		
-			/*
-			 * Relevant structure of token:
-			 *
-			 * htmlmixed
-			 * 		className
-			 * 		state
-			 * 			htmlState
-			 * 				type
-			 *				tagName
-			 * 				context
-			 * 					tagName
-			 * 			mode
-			 * 
-			 * xml
-			 * 		className
-			 * 		state
-			 * 			tagName
-			 * 			type
-			 */
-		
-			var pos = cm.getCursor();
-			var tok = cm.getTokenAt(pos);
-			var state = tok.state;
-			
-			if (state.mode && state.mode != 'html') {
-				throw CodeMirror.Pass; // With htmlmixed, we only care about the html sub-mode.
-			}
+		var pos = cm.getCursor();
+		var tok = cm.getTokenAt(pos);
+		var state = innerState(cm, tok.state);
+
+		if (state) {
 			
 			if (ch == '>') {
-				var type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
+				var type = state.type;
 				
 				if (tok.className == 'tag' && type == 'closeTag') {
 					throw CodeMirror.Pass; // Don't process the '>' at the end of an end-tag.
@@ -83,11 +82,12 @@
 				cm.setCursor(pos);
 		
 				tok = cm.getTokenAt(cm.getCursor());
-				state = tok.state;
-				type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
+				state = innerState(cm, tok.state);
+				if (!state) throw CodeMirror.Pass;
+				var type = state.type;
 
 				if (tok.className == 'tag' && type != 'selfcloseTag') {
-					var tagName = state.htmlState ? state.htmlState.tagName : state.tagName; // htmlmixed : xml
+					var tagName = state.tagName;
 					if (tagName.length > 0 && shouldClose(cm, vd, tagName)) {
 						insertEndTag(cm, indent, pos, tagName);
 					}
@@ -100,7 +100,7 @@
 			
 			} else if (ch == '/') {
 				if (tok.className == 'tag' && tok.string == '<') {
-					var tagName = state.htmlState ? (state.htmlState.context ? state.htmlState.context.tagName : '') : (state.context ? state.context.tagName : ''); // htmlmixed : xml
+					var ctx = state.context, tagName = ctx ? ctx.tagName : '';
 					if (tagName.length > 0) {
 						completeEndTag(cm, pos, tagName);
 						return;

data/vendor/assets/javascripts/codemirror/utils/formatting.js

@@ -1,110 +1,22 @@
 // ============== Formatting extensions ============================
-// A common storage for all mode-specific formatting features
-if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {};
-
-// Returns the extension of the editor's current mode
-CodeMirror.defineExtension("getModeExt", function () {
-  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
-// the specified position (can be htmlmixed, css or javascript). Otherwise, simply
-// returns the extension of the editor's current mode.
-CodeMirror.defineExtension("getModeExtAtPos", function (pos) {
-  var token = this.getTokenAt(pos);
-  if (token && token.state && token.state.mode)
-    return CodeMirror.modeExtensions[token.state.mode == "html" ? "htmlmixed" : token.state.mode];
-  else
-    return this.getModeExt();
-});
-
-// Comment/uncomment the specified range
-CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
-  var curMode = this.getModeExtAtPos(this.getCursor());
-  if (isComment) { // Comment range
-    var commentedText = this.getRange(from, to);
-    this.replaceRange(curMode.commentStart + this.getRange(from, to) + curMode.commentEnd
-      , from, to);
-    if (from.line == to.line && from.ch == to.ch) { // An empty comment inserted - put cursor inside
-      this.setCursor(from.line, from.ch + curMode.commentStart.length);
-    }
-  }
-  else { // Uncomment range
-    var selText = this.getRange(from, to);
-    var startIndex = selText.indexOf(curMode.commentStart);
-    var endIndex = selText.lastIndexOf(curMode.commentEnd);
-    if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
-      // Take string till comment start
-      selText = selText.substr(0, startIndex)
-      // From comment start till comment end
-        + selText.substring(startIndex + curMode.commentStart.length, endIndex)
-      // From comment end till string end
-        + selText.substr(endIndex + curMode.commentEnd.length);
-    }
-    this.replaceRange(selText, from, to);
-  }
-});
-
-// Applies automatic mode-aware indentation to the specified range
-CodeMirror.defineExtension("autoIndentRange", function (from, to) {
-  var cmInstance = this;
-  this.operation(function () {
-    for (var i = from.line; i <= to.line; i++) {
-      cmInstance.indentLine(i, "smart");
+(function() {
+  // Define extensions for a few modes
+  CodeMirror.extendMode("css", {
+    commentStart: "/*",
+    commentEnd: "*/",
+    wordWrapChars: [";", "\\{", "\\}"],
+    autoFormatLineBreaks: function (text) {
+      return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
     }
   });
-});
-
-// Applies automatic formatting to the specified range
-CodeMirror.defineExtension("autoFormatRange", function (from, to) {
-  var absStart = this.indexFromPos(from);
-  var absEnd = this.indexFromPos(to);
-  // Insert additional line breaks where necessary according to the
-  // mode's syntax
-  var res = this.getModeExt().autoFormatLineBreaks(this.getValue(), absStart, absEnd);
-  var cmInstance = this;
-
-  // Replace and auto-indent the range
-  this.operation(function () {
-    cmInstance.replaceRange(res, 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, "smart");
-    }
-  });
-});
-
-// Define extensions for a few modes
-
-CodeMirror.modeExtensions["css"] = {
-  commentStart: "/*",
-  commentEnd: "*/",
-  wordWrapChars: [";", "\\{", "\\}"],
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
-  }
-};
 
-CodeMirror.modeExtensions["javascript"] = {
-  commentStart: "/*",
-  commentEnd: "*/",
-  wordWrapChars: [";", "\\{", "\\}"],
-
-  getNonBreakableBlocks: function (text) {
-    var nonBreakableRegexes = [
-        new RegExp("for\\s*?\\(([\\s\\S]*?)\\)"),
-        new RegExp("\\\\\"([\\s\\S]*?)(\\\\\"|$)"),
-        new RegExp("\\\\\'([\\s\\S]*?)(\\\\\'|$)"),
-        new RegExp("'([\\s\\S]*?)('|$)"),
-        new RegExp("\"([\\s\\S]*?)(\"|$)"),
-        new RegExp("//.*([\r\n]|$)")
-      ];
-    var nonBreakableBlocks = new Array();
+  function jsNonBreakableBlocks(text) {
+    var nonBreakableRegexes = [/for\s*?\((.*?)\)/,
+                               /\"(.*?)(\"|$)/,
+                               /\'(.*?)(\'|$)/,
+                               /\/\*(.*?)(\*\/|$)/,
+                               /\/\/.*/];
+    var nonBreakableBlocks = [];
     for (var i = 0; i < nonBreakableRegexes.length; i++) {
       var curPos = 0;
       while (curPos < text.length) {
@@ -126,174 +38,156 @@ CodeMirror.modeExtensions["javascript"] = {
     });
 
     return nonBreakableBlocks;
-  },
+  }
 
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    var curPos = 0;
-    var reLinesSplitter = new RegExp("(;|\\{|\\})([^\r\n;])", "g");
-    var nonBreakableBlocks = this.getNonBreakableBlocks(text);
-    if (nonBreakableBlocks != null) {
-      var res = "";
-      for (var i = 0; i < nonBreakableBlocks.length; i++) {
-        if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
-          res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
-          curPos = nonBreakableBlocks[i].start;
-        }
-        if (nonBreakableBlocks[i].start <= curPos
-          && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
-          res += text.substring(curPos, nonBreakableBlocks[i].end);
-          curPos = nonBreakableBlocks[i].end;
+  CodeMirror.extendMode("javascript", {
+    commentStart: "/*",
+    commentEnd: "*/",
+    wordWrapChars: [";", "\\{", "\\}"],
+
+    autoFormatLineBreaks: function (text) {
+      var curPos = 0;
+      var reLinesSplitter = /(;|\{|\})([^\r\n;])/g;
+      var nonBreakableBlocks = jsNonBreakableBlocks(text);
+      if (nonBreakableBlocks != null) {
+        var res = "";
+        for (var i = 0; i < nonBreakableBlocks.length; i++) {
+          if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
+            res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
+            curPos = nonBreakableBlocks[i].start;
+          }
+          if (nonBreakableBlocks[i].start <= curPos
+              && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
+            res += text.substring(curPos, nonBreakableBlocks[i].end);
+            curPos = nonBreakableBlocks[i].end;
+          }
         }
+        if (curPos < text.length)
+          res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
+        return res;
+      } else {
+        return text.replace(reLinesSplitter, "$1\n$2");
       }
-      if (curPos < text.length - 1) {
-        res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
-      }
-      return res;
     }
-    else {
-      return text.replace(reLinesSplitter, "$1\n$2");
-    }
-  }
-};
-
-CodeMirror.modeExtensions["xml"] = {
-  commentStart: "<!--",
-  commentEnd: "-->",
-  wordWrapChars: [">"],
+  });
 
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    var lines = text.split("\n");
-    var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
-    var reOpenBrackets = new RegExp("<", "g");
-    var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
-    for (var i = 0; i < lines.length; i++) {
-      var mToProcess = lines[i].match(reProcessedPortion);
-      if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
-        lines[i] = mToProcess[1]
+  CodeMirror.extendMode("xml", {
+    commentStart: "<!--",
+    commentEnd: "-->",
+    wordWrapChars: [">"],
+
+    autoFormatLineBreaks: function (text) {
+      var lines = text.split("\n");
+      var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
+      var reOpenBrackets = new RegExp("<", "g");
+      var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
+      for (var i = 0; i < lines.length; i++) {
+        var mToProcess = lines[i].match(reProcessedPortion);
+        if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
+          lines[i] = mToProcess[1]
             + mToProcess[2].replace(reOpenBrackets, "\n$&").replace(reCloseBrackets, "$1\n$2")
             + mToProcess[3];
-        continue;
+          continue;
+        }
       }
+      return lines.join("\n");
     }
+  });
 
-    return lines.join("\n");
+  function localModeAt(cm, pos) {
+    return CodeMirror.innerMode(cm.getMode(), cm.getTokenAt(pos).state).mode;
   }
-};
-
-CodeMirror.modeExtensions["htmlmixed"] = {
-  commentStart: "<!--",
-  commentEnd: "-->",
-  wordWrapChars: [">", ";", "\\{", "\\}"],
 
-  getModeInfos: function (text, absPos) {
-    var modeInfos = new Array();
-    modeInfos[0] =
-      {
-        pos: 0,
-        modeExt: CodeMirror.modeExtensions["xml"],
-        modeName: "xml"
-      };
-
-    var modeMatchers = new Array();
-    modeMatchers[0] =
-      {
-        regex: new RegExp("<style[^>]*>([\\s\\S]*?)(</style[^>]*>|$)", "i"),
-        modeExt: CodeMirror.modeExtensions["css"],
-        modeName: "css"
-      };
-    modeMatchers[1] =
-      {
-        regex: new RegExp("<script[^>]*>([\\s\\S]*?)(</script[^>]*>|$)", "i"),
-        modeExt: CodeMirror.modeExtensions["javascript"],
-        modeName: "javascript"
-      };
+  function enumerateModesBetween(cm, line, start, end) {
+    var outer = cm.getMode(), text = cm.getLine(line);
+    if (end == null) end = text.length;
+    if (!outer.innerMode) return [{from: start, to: end, mode: outer}];
+    var state = cm.getTokenAt({line: line, ch: start}).state;
+    var mode = CodeMirror.innerMode(outer, state).mode;
+    var found = [], stream = new CodeMirror.StringStream(text);
+    stream.pos = stream.start = start;
+    for (;;) {
+      outer.token(stream, state);
+      var curMode = CodeMirror.innerMode(outer, state).mode;
+      if (curMode != mode) {
+        var cut = stream.start;
+        // Crappy heuristic to deal with the fact that a change in
+        // mode can occur both at the end and the start of a token,
+        // and we don't know which it was.
+        if (mode.name == "xml" && text.charAt(stream.pos - 1) == ">") cut = stream.pos;
+        found.push({from: start, to: cut, mode: mode});
+        start = cut;
+        mode = curMode;
+      }
+      if (stream.pos >= end) break;
+      stream.start = stream.pos;
+    }
+    if (start < end) found.push({from: start, to: end, mode: mode});
+    return found;
+  }
 
-    var lastCharPos = (typeof (absPos) !== "undefined" ? absPos : text.length - 1);
-    // Detect modes for the entire text
-    for (var i = 0; i < modeMatchers.length; i++) {
-      var curPos = 0;
-      while (curPos <= lastCharPos) {
-        var m = text.substr(curPos).match(modeMatchers[i].regex);
-        if (m != null) {
-          if (m.length > 1 && m[1].length > 0) {
-            // Push block begin pos
-            var blockBegin = curPos + m.index + m[0].indexOf(m[1]);
-            modeInfos.push(
-              {
-                pos: blockBegin,
-                modeExt: modeMatchers[i].modeExt,
-                modeName: modeMatchers[i].modeName
-              });
-            // Push block end pos
-            modeInfos.push(
-              {
-                pos: blockBegin + m[1].length,
-                modeExt: modeInfos[0].modeExt,
-                modeName: modeInfos[0].modeName
-              });
-            curPos += m.index + m[0].length;
-            continue;
-          }
-          else {
-            curPos += m.index + Math.max(m[0].length, 1);
-          }
-        }
-        else { // No more matches
-          break;
+  // Comment/uncomment the specified range
+  CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
+    var curMode = localModeAt(this, from), cm = this;
+    this.operation(function() {
+      if (isComment) { // Comment range
+        cm.replaceRange(curMode.commentEnd, to);
+        cm.replaceRange(curMode.commentStart, from);
+        if (from.line == to.line && from.ch == to.ch) // An empty comment inserted - put cursor inside
+          cm.setCursor(from.line, from.ch + curMode.commentStart.length);
+      } else { // Uncomment range
+        var selText = cm.getRange(from, to);
+        var startIndex = selText.indexOf(curMode.commentStart);
+        var endIndex = selText.lastIndexOf(curMode.commentEnd);
+        if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
+          // Take string till comment start
+          selText = selText.substr(0, startIndex)
+          // From comment start till comment end
+            + selText.substring(startIndex + curMode.commentStart.length, endIndex)
+          // From comment end till string end
+            + selText.substr(endIndex + curMode.commentEnd.length);
         }
+        cm.replaceRange(selText, from, to);
       }
-    }
-    // Sort mode infos
-    modeInfos.sort(function sortModeInfo(a, b) {
-      return a.pos - b.pos;
     });
+  });
 
-    return modeInfos;
-  },
-
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    var modeInfos = this.getModeInfos(text);
-    var reBlockStartsWithNewline = new RegExp("^\\s*?\n");
-    var reBlockEndsWithNewline = new RegExp("\n\\s*?$");
-    var res = "";
-    // Use modes info to break lines correspondingly
-    if (modeInfos.length > 1) { // Deal with multi-mode text
-      for (var i = 1; i <= modeInfos.length; i++) {
-        var selStart = modeInfos[i - 1].pos;
-        var selEnd = (i < modeInfos.length ? modeInfos[i].pos : endPos);
+  // Applies automatic mode-aware indentation to the specified range
+  CodeMirror.defineExtension("autoIndentRange", function (from, to) {
+    var cmInstance = this;
+    this.operation(function () {
+      for (var i = from.line; i <= to.line; i++) {
+        cmInstance.indentLine(i, "smart");
+      }
+    });
+  });
 
-        if (selStart >= endPos) { // The block starts later than the needed fragment
-          break;
+  // Applies automatic formatting to the specified range
+  CodeMirror.defineExtension("autoFormatRange", function (from, to) {
+    var cm = this;
+    cm.operation(function () {
+      for (var cur = from.line, end = to.line; cur <= end; ++cur) {
+        var f = {line: cur, ch: cur == from.line ? from.ch : 0};
+        var t = {line: cur, ch: cur == end ? to.ch : null};
+        var modes = enumerateModesBetween(cm, cur, f.ch, t.ch), mangled = "";
+        var text = cm.getRange(f, t);
+        for (var i = 0; i < modes.length; ++i) {
+          var part = modes.length > 1 ? text.slice(modes[i].from, modes[i].to) : text;
+          if (mangled) mangled += "\n";
+          if (modes[i].mode.autoFormatLineBreaks) {
+            mangled += modes[i].mode.autoFormatLineBreaks(part);
+          } else mangled += text;
         }
-        if (selStart < startPos) {
-          if (selEnd <= startPos) { // The block starts earlier than the needed fragment
-            continue;
-          }
-          selStart = startPos;
-        }
-        if (selEnd > endPos) {
-          selEnd = endPos;
-        }
-        var textPortion = text.substring(selStart, selEnd);
-        if (modeInfos[i - 1].modeName != "xml") { // Starting a CSS or JavaScript block
-          if (!reBlockStartsWithNewline.test(textPortion)
-              && selStart > 0) { // The block does not start with a line break
-            textPortion = "\n" + textPortion;
-          }
-          if (!reBlockEndsWithNewline.test(textPortion)
-              && selEnd < text.length - 1) { // The block does not end with a line break
-            textPortion += "\n";
-          }
+        if (mangled != text) {
+          for (var count = 0, pos = mangled.indexOf("\n"); pos != -1; pos = mangled.indexOf("\n", pos + 1), ++count) {}
+          cm.replaceRange(mangled, f, t);
+          cur += count;
+          end += count;
         }
-        res += modeInfos[i - 1].modeExt.autoFormatLineBreaks(textPortion);
       }
-    }
-    else { // Single-mode text
-      res = modeInfos[0].modeExt.autoFormatLineBreaks(text.substring(startPos, endPos));
-    }
-
-    return res;
-  }
-};
+      for (var cur = from.line + 1; cur <= end; ++cur)
+        cm.indentLine(cur, "smart");
+      cm.setSelection(from, cm.getCursor(false));
+    });
+  });
+})();