DevTools: roll CodeMirror to v4.0.3

Source/devtools/front_end/CodeMirrorTextEditor.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 70 matching lines @@
         "Down": "goLineDown",
         "End": "goLineEnd",
         "Home": "goLineStartSmart",
         "PageUp": "goPageUp",
         "PageDown": "goPageDown",
         "Delete": "delCharAfter",
         "Backspace": "delCharBefore",
         "Tab": "defaultTab",
         "Shift-Tab": "indentLess",
         "Enter": "smartNewlineAndIndent",
-        "Ctrl-Space": "autocomplete"
+        "Ctrl-Space": "autocomplete",
+        "Esc": "dismissMultipleSelections"
     };
 
     CodeMirror.keyMap["devtools-pc"] = {
         "Ctrl-A": "selectAll",
         "Ctrl-Z": "undoAndReveal",
         "Shift-Ctrl-Z": "redoAndReveal",
         "Ctrl-Y": "redo",
         "Ctrl-Home": "goDocStart",
         "Ctrl-Up": "goDocStart",
         "Ctrl-End": "goDocEnd",
@@ skipping 38 matching lines @@
     this._codeMirror.setOption("crudeMeasuringFrom", 1000);
 
     this._shouldClearHistory = true;
     this._lineSeparator = "\n";
 
     this._tokenHighlighter = new WebInspector.CodeMirrorTextEditor.TokenHighlighter(this._codeMirror);
     this._blockIndentController = new WebInspector.CodeMirrorTextEditor.BlockIndentController(this._codeMirror);
     this._fixWordMovement = new WebInspector.CodeMirrorTextEditor.FixWordMovement(this._codeMirror);
     this._autocompleteController = new WebInspector.CodeMirrorTextEditor.AutocompleteController(this, this._codeMirror);
 
-    this._codeMirror.on("change", this._change.bind(this));
+    this._codeMirror.on("changes", this._changes.bind(this));
     this._codeMirror.on("beforeChange", this._beforeChange.bind(this));
     this._codeMirror.on("gutterClick", this._gutterClick.bind(this));
     this._codeMirror.on("cursorActivity", this._cursorActivity.bind(this));
     this._codeMirror.on("beforeSelectionChange", this._beforeSelectionChange.bind(this));
     this._codeMirror.on("scroll", this._scroll.bind(this));
     this._codeMirror.on("focus", this._focus.bind(this));
     this._codeMirror.on("blur", this._blur.bind(this));
     this.element.addEventListener("contextmenu", this._contextMenu.bind(this), false);
     /**
      * @this {WebInspector.CodeMirrorTextEditor}
@@ skipping 70 matching lines @@
 
 CodeMirror.commands.redoAndReveal = function(codemirror)
 {
     var scrollInfo = codemirror.getScrollInfo();
     codemirror.execCommand("redo");
     var cursor = codemirror.getCursor("start");
     codemirror._codeMirrorTextEditor._innerRevealLine(cursor.line, scrollInfo);
     codemirror._codeMirrorTextEditor._autocompleteController.finishAutocomplete();
 }
 
+CodeMirror.commands.dismissMultipleSelections = function(codemirror)
+{
+    if (codemirror.getSelections().length <= 1)
+        return CodeMirror.Pass;
+    var range = codemirror.listSelections()[0];
+    codemirror.setSelection(range.anchor, range.head, {scroll: false});
+    codemirror._codeMirrorTextEditor._revealLine(range.anchor.line);
+}
+
 WebInspector.CodeMirrorTextEditor.LongLineModeLineLengthThreshold = 2000;
 WebInspector.CodeMirrorTextEditor.MaximumNumberOfWhitespacesPerSingleSpan = 16;
 WebInspector.CodeMirrorTextEditor.MaxEditableTextSize = 1024 * 1024 * 10;
 
 WebInspector.CodeMirrorTextEditor.prototype = {
     _enableBracketMatchingIfNeeded: function()
     {
         this._codeMirror.setOption("autoCloseBrackets", WebInspector.settings.textEditorBracketMatching.get() ? { explode: false } : false);
     },
 
@@ skipping 679 matching lines @@
     {
         if (!this._dictionary)
             return;
         this._updatedLines = this._updatedLines || {};
         for (var i = changeObject.from.line; i <= changeObject.to.line; ++i)
             this._updatedLines[i] = this.line(i);
     },
 
     /**
      * @param {!CodeMirror} codeMirror
-     * @param {!WebInspector.CodeMirrorTextEditor.ChangeObject} changeObject
+     * @param {!Array.<!WebInspector.CodeMirrorTextEditor.ChangeObject>} changes
      */
-    _change: function(codeMirror, changeObject)
+    _changes: function(codeMirror, changes)
     {
+        if (!changes.length)
+            return;
         // We do not show "scroll beyond end of file" span for one line documents, so we need to check if "document has one line" changed.
         var hasOneLine = this._codeMirror.lineCount() === 1;
         if (hasOneLine !== this._hasOneLine)
             this._resizeEditor();
         this._hasOneLine = hasOneLine;
         var widgets = this._elementToWidget.values();
         for (var i = 0; i < widgets.length; ++i)
             this._codeMirror.removeLineWidget(widgets[i]);
         this._elementToWidget.clear();
 
         if (this._updatedLines) {
             for (var lineNumber in this._updatedLines)
                 this._removeTextFromCompletionDictionary(this._updatedLines[lineNumber]);
             delete this._updatedLines;
         }
 
         var linesToUpdate = {};
         var singleCharInput = false;
-        do {
+        for (var changeIndex = 0; changeIndex < changes.length; ++changeIndex) {
+            var changeObject = changes[changeIndex];
             var oldRange = this._toRange(changeObject.from, changeObject.to);
             var newRange = oldRange.clone();
             var linesAdded = changeObject.text.length;
             singleCharInput = (changeObject.origin === "+input" && changeObject.text.length === 1 && changeObject.text[0].length === 1) ||
                 (changeObject.origin === "+delete" && changeObject.removed.length === 1 && changeObject.removed[0].length === 1);
             if (linesAdded === 0) {
                 newRange.endLine = newRange.startLine;
                 newRange.endColumn = newRange.startColumn;
             } else if (linesAdded === 1) {
                 newRange.endLine = newRange.startLine;
                 newRange.endColumn = newRange.startColumn + changeObject.text[0].length;
             } else {
                 newRange.endLine = newRange.startLine + linesAdded - 1;
                 newRange.endColumn = changeObject.text[linesAdded - 1].length;
             }
 
             if (!this._muteTextChangedEvent)
                 this._delegate.onTextChanged(oldRange, newRange);
 
             if (this._dictionary) {
                 for (var i = newRange.startLine; i <= newRange.endLine; ++i)
                     linesToUpdate[i] = this.line(i);
             }
-        } while (changeObject = changeObject.next);
+        }
         if (this._dictionary) {
             for (var lineNumber in linesToUpdate)
                 this._addTextToCompletionDictionary(linesToUpdate[lineNumber]);
         }
         if (singleCharInput)
             this._autocompleteController.autocomplete();
     },
 
     _cursorActivity: function()
     {
         var start = this._codeMirror.getCursor("anchor");
         var end = this._codeMirror.getCursor("head");
         this._delegate.selectionChanged(this._toRange(start, end));
         if (!this._tokenHighlighter.highlightedRegex())
             this._codeMirror.operation(this._tokenHighlighter.highlightSelectedTokens.bind(this._tokenHighlighter));
     },
 
     /**
      * @param {!CodeMirror} codeMirror
-     * @param {!{head: !CodeMirror.Pos, anchor: !CodeMirror.Pos}} selection
+     * @param {{ranges: !Array.<{head: !CodeMirror.Pos, anchor: !CodeMirror.Pos}>}} selection
      */
     _beforeSelectionChange: function(codeMirror, selection)
     {
         if (!this._isHandlingMouseDownEvent)
             return;
-        this._reportJump(this.selection(), this._toRange(selection.anchor, selection.head));
+        if (!selection.ranges.length)
+            return;
+        var primarySelection = selection.ranges[0];
+        this._reportJump(this.selection(), this._toRange(primarySelection.anchor, primarySelection.head));
     },
 
     /**
      * @param {?WebInspector.TextRange} from
      * @param {?WebInspector.TextRange} to
      */
     _reportJump: function(from, to)
     {
         if (from && to && from.equal(to))
             return;
@@ skipping 304 matching lines @@
         if (this._highlightDescriptor && this._highlightDescriptor.selectionStart)
             this._codeMirror.removeLineClass(this._highlightDescriptor.selectionStart.line, "wrap", "cm-line-with-selection");
         this._removeHighlight();
         var selectionStart = this._codeMirror.getCursor("start");
         var selectionEnd = this._codeMirror.getCursor("end");
         if (selectionStart.line !== selectionEnd.line)
             return;
         if (selectionStart.ch === selectionEnd.ch)
             return;
 
-        var selectedText = this._codeMirror.getSelection();
+        var selections = this._codeMirror.getSelections();
+        if (selections.length !== 1)
+            return;
+        var selectedText = selections[0];
         if (this._isWord(selectedText, selectionStart.line, selectionStart.ch, selectionEnd.ch)) {
             if (selectionStart)
                 this._codeMirror.addLineClass(selectionStart.line, "wrap", "cm-line-with-selection")
             this._setHighlighter(this._tokenHighlighter.bind(this, selectedText, selectionStart), selectionStart);
         }
     },
 
     /**
      * @param {string} selectedText
      * @param {number} lineNumber
@@ skipping 144 matching lines @@
 }
 
 /**
  * @constructor
  * @param {!CodeMirror} codeMirror
  */
 WebInspector.CodeMirrorTextEditor.FixWordMovement = function(codeMirror)
 {
     function moveLeft(shift, codeMirror)
     {
+        codeMirror.setExtending(shift);
         var cursor = codeMirror.getCursor("head");
-        if (cursor.ch !== 0 || cursor.line === 0)
-            return CodeMirror.Pass;
-        codeMirror.setExtending(shift);
-        codeMirror.execCommand("goLineUp");
-        codeMirror.execCommand("goLineEnd")
+        codeMirror.execCommand("goGroupLeft");
+        var newCursor = codeMirror.getCursor("head");
+        if (newCursor.ch === 0 && newCursor.line !== 0) {
+            codeMirror.setExtending(false);
+            return;
+        }
+
+        var skippedText = codeMirror.getRange(newCursor, cursor, "#");
+        if (/^\s+$/.test(skippedText))
+            codeMirror.execCommand("goGroupLeft");
         codeMirror.setExtending(false);
     }
+
     function moveRight(shift, codeMirror)
     {
+        codeMirror.setExtending(shift);
         var cursor = codeMirror.getCursor("head");
-        var line = codeMirror.getLine(cursor.line);
-        if (cursor.ch !== line.length || cursor.line + 1 === codeMirror.lineCount())
-            return CodeMirror.Pass;
-        codeMirror.setExtending(shift);
-        codeMirror.execCommand("goLineDown");
-        codeMirror.execCommand("goLineStart");
+        codeMirror.execCommand("goGroupRight");
+        var newCursor = codeMirror.getCursor("head");
+        if (newCursor.ch === 0 && newCursor.line !== 0) {
+            codeMirror.setExtending(false);
+            return;
+        }
+
+        var skippedText = codeMirror.getRange(cursor, newCursor, "#");
+        if (/^\s+$/.test(skippedText))
+            codeMirror.execCommand("goGroupRight");
         codeMirror.setExtending(false);
     }
-    function delWordBack(codeMirror)
-    {
-        if (codeMirror.somethingSelected())
-            return CodeMirror.Pass;
-        var cursor = codeMirror.getCursor("head");
-        if (cursor.ch === 0)
-            codeMirror.execCommand("delCharBefore");
-        else
-            return CodeMirror.Pass;
-    }
 
     var modifierKey = WebInspector.isMac() ? "Alt" : "Ctrl";
     var leftKey = modifierKey + "-Left";
     var rightKey = modifierKey + "-Right";
     var keyMap = {};
     keyMap[leftKey] = moveLeft.bind(null, false);
     keyMap[rightKey] = moveRight.bind(null, false);
     keyMap["Shift-" + leftKey] = moveLeft.bind(null, true);
     keyMap["Shift-" + rightKey] = moveRight.bind(null, true);
-    keyMap[modifierKey + "-Backspace"] = delWordBack;
     codeMirror.addKeyMap(keyMap);
 }
 
 /**
  * @constructor
  * @implements {WebInspector.SuggestBoxDelegate}
  * @param {!WebInspector.CodeMirrorTextEditor} textEditor
  * @param {!CodeMirror} codeMirror
  */
 WebInspector.CodeMirrorTextEditor.AutocompleteController = function(textEditor, codeMirror)
 {
     this._textEditor = textEditor;
     this._codeMirror = codeMirror;
     this._codeMirror.on("scroll", this._onScroll.bind(this));
     this._codeMirror.on("cursorActivity", this._onCursorActivity.bind(this));
 }
 
 WebInspector.CodeMirrorTextEditor.AutocompleteController.prototype = {
+    /**
+     * @param {!WebInspector.TextRange} mainSelection
+     * @param {!Array.<!{head: !CodeMirror.Pos, anchor: !CodeMirror.Pos}>} selections
+     * @return {boolean}
+     */
+    _validateSelectionsContexts: function(mainSelection, selections)
+    {
+        var mainSelectionContext = this._textEditor.copyRange(mainSelection);
+        for (var i = 0; i < selections.length; ++i) {
+            var wordRange = this._textEditor._wordRangeForCursorPosition(selections[i].head.line, selections[i].head.ch, false);
+            if (!wordRange)
+                return false;
+            var context = this._textEditor.copyRange(wordRange);
+            if (context !== mainSelectionContext)
+                return false;
+        }
+        return true;
+    },
+
     autocomplete: function()
     {
         var dictionary = this._textEditor._dictionary;
         if (!dictionary || this._codeMirror.somethingSelected()) {
             this.finishAutocomplete();
             return;
         }
 
-        var cursor = this._codeMirror.getCursor();
+        var selections = this._codeMirror.listSelections().slice();
+        var topSelection = selections.shift();
+        var cursor = topSelection.head;
         var substituteRange = this._textEditor._wordRangeForCursorPosition(cursor.line, cursor.ch, false);
-        if (!substituteRange || substituteRange.startColumn === cursor.ch) {
+        if (!substituteRange || substituteRange.startColumn === cursor.ch || !this._validateSelectionsContexts(substituteRange, selections)) {
             this.finishAutocomplete();
             return;
         }
+
         var prefixRange = substituteRange.clone();
         prefixRange.endColumn = cursor.ch;
 
         var substituteWord = this._textEditor.copyRange(substituteRange);
         var hasPrefixInDictionary = dictionary.hasWord(substituteWord);
         if (hasPrefixInDictionary)
             dictionary.removeWord(substituteWord);
         var wordsWithPrefix = dictionary.wordsWithPrefix(this._textEditor.copyRange(prefixRange));
         if (hasPrefixInDictionary)
             dictionary.addWord(substituteWord);
@@ skipping 49 matching lines @@
      * @param {string} suggestion
      * @param {boolean=} isIntermediateSuggestion
      */
     applySuggestion: function(suggestion, isIntermediateSuggestion)
     {
         this._currentSuggestion = suggestion;
     },
 
     acceptSuggestion: function()
     {
-        if (this._prefixRange.endColumn - this._prefixRange.startColumn !== this._currentSuggestion.length) {
-            var pos = this._textEditor._toPos(this._prefixRange);
-            this._codeMirror.replaceRange(this._currentSuggestion, pos.start, pos.end, "+autocomplete");
+        if (this._prefixRange.endColumn - this._prefixRange.startColumn === this._currentSuggestion.length)
+            return;
+
+        var selections = this._codeMirror.listSelections().slice();
+        var prefixLength = this._prefixRange.endColumn - this._prefixRange.startColumn;
+        for (var i = selections.length - 1; i >= 0; --i) {
+            var start = selections[i].head;
+            var end = new CodeMirror.Pos(start.line, start.ch - prefixLength);
+            this._codeMirror.replaceRange(this._currentSuggestion, start, end, "+autocomplete");
         }
     },
 
     _onScroll: function()
     {
         if (!this._suggestBox)
             return;
         var cursor = this._codeMirror.getCursor();
         var scrollInfo = this._codeMirror.getScrollInfo();
         var topmostLineNumber = this._codeMirror.lineAtHeight(scrollInfo.top, "local");
@@ skipping 68 matching lines @@
     var backgroundColorRule = backgroundColor ? ".CodeMirror .CodeMirror-selected { background-color: " + backgroundColor + ";}" : "";
     var foregroundColor = InspectorFrontendHost.getSelectionForegroundColor();
     var foregroundColorRule = foregroundColor ? ".CodeMirror .CodeMirror-selectedtext:not(.CodeMirror-persist-highlight) { color: " + foregroundColor + "!important;}" : "";
     if (!foregroundColorRule && !backgroundColorRule)
         return;
 
     var style = document.createElement("style");
     style.textContent = backgroundColorRule + foregroundColorRule;
     document.head.appendChild(style);
 })();