| Index: third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js b/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js
|
| index 4fc1966aee22d7d67206bfa6f8512d296c091f78..d3cbcf226c44b5349df3ed033ee6e195d883e3d0 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/text_editor/CodeMirrorTextEditor.js
|
| @@ -170,7 +170,7 @@ WebInspector.CodeMirrorTextEditor = function(options)
|
| this.setMimeType(options.mimeType);
|
| if (options.autoHeight)
|
| this._codeMirror.setSize(null, "auto");
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorTextEditor.maxHighlightLength = 1000;
|
|
|
| @@ -182,7 +182,7 @@ WebInspector.CodeMirrorTextEditor.autocompleteCommand = function(codeMirror)
|
| var autocompleteController = codeMirror._codeMirrorTextEditor._autocompleteController;
|
| if (autocompleteController)
|
| autocompleteController.autocomplete();
|
| -}
|
| +};
|
| CodeMirror.commands.autocomplete = WebInspector.CodeMirrorTextEditor.autocompleteCommand;
|
|
|
| /**
|
| @@ -191,7 +191,7 @@ CodeMirror.commands.autocomplete = WebInspector.CodeMirrorTextEditor.autocomplet
|
| WebInspector.CodeMirrorTextEditor.undoLastSelectionCommand = function(codeMirror)
|
| {
|
| codeMirror._codeMirrorTextEditor._selectNextOccurrenceController.undoLastSelection();
|
| -}
|
| +};
|
| CodeMirror.commands.undoLastSelection = WebInspector.CodeMirrorTextEditor.undoLastSelectionCommand;
|
|
|
| /**
|
| @@ -200,7 +200,7 @@ CodeMirror.commands.undoLastSelection = WebInspector.CodeMirrorTextEditor.undoLa
|
| WebInspector.CodeMirrorTextEditor.selectNextOccurrenceCommand = function(codeMirror)
|
| {
|
| codeMirror._codeMirrorTextEditor._selectNextOccurrenceController.selectNextOccurrence();
|
| -}
|
| +};
|
| CodeMirror.commands.selectNextOccurrence = WebInspector.CodeMirrorTextEditor.selectNextOccurrenceCommand;
|
|
|
| /**
|
| @@ -210,7 +210,7 @@ CodeMirror.commands.selectNextOccurrence = WebInspector.CodeMirrorTextEditor.sel
|
| WebInspector.CodeMirrorTextEditor.moveCamelLeftCommand = function(shift, codeMirror)
|
| {
|
| codeMirror._codeMirrorTextEditor._doCamelCaseMovement(-1, shift);
|
| -}
|
| +};
|
| CodeMirror.commands.moveCamelLeft = WebInspector.CodeMirrorTextEditor.moveCamelLeftCommand.bind(null, false);
|
| CodeMirror.commands.selectCamelLeft = WebInspector.CodeMirrorTextEditor.moveCamelLeftCommand.bind(null, true);
|
|
|
| @@ -221,7 +221,7 @@ CodeMirror.commands.selectCamelLeft = WebInspector.CodeMirrorTextEditor.moveCame
|
| WebInspector.CodeMirrorTextEditor.moveCamelRightCommand = function(shift, codeMirror)
|
| {
|
| codeMirror._codeMirrorTextEditor._doCamelCaseMovement(1, shift);
|
| -}
|
| +};
|
| CodeMirror.commands.moveCamelRight = WebInspector.CodeMirrorTextEditor.moveCamelRightCommand.bind(null, false);
|
| CodeMirror.commands.selectCamelRight = WebInspector.CodeMirrorTextEditor.moveCamelRightCommand.bind(null, true);
|
|
|
| @@ -247,7 +247,7 @@ CodeMirror.commands.gotoMatchingBracket = function(codeMirror)
|
| });
|
| }
|
| codeMirror.setSelections(updatedSelections);
|
| -}
|
| +};
|
|
|
| /**
|
| * @param {!CodeMirror} codemirror
|
| @@ -261,7 +261,7 @@ CodeMirror.commands.undoAndReveal = function(codemirror)
|
| var autocompleteController = codemirror._codeMirrorTextEditor._autocompleteController;
|
| if (autocompleteController)
|
| autocompleteController.clearAutocomplete();
|
| -}
|
| +};
|
|
|
| /**
|
| * @param {!CodeMirror} codemirror
|
| @@ -275,7 +275,7 @@ CodeMirror.commands.redoAndReveal = function(codemirror)
|
| var autocompleteController = codemirror._codeMirrorTextEditor._autocompleteController;
|
| if (autocompleteController)
|
| autocompleteController.clearAutocomplete();
|
| -}
|
| +};
|
|
|
| /**
|
| * @return {!Object|undefined}
|
| @@ -294,7 +294,7 @@ CodeMirror.commands.dismiss = function(codemirror)
|
|
|
| codemirror.setSelection(selection.anchor, selection.head, {scroll: false});
|
| codemirror._codeMirrorTextEditor.scrollLineIntoView(selection.anchor.line);
|
| -}
|
| +};
|
|
|
| /**
|
| * @return {!Object|undefined}
|
| @@ -304,7 +304,7 @@ CodeMirror.commands.smartPageUp = function(codemirror)
|
| if (codemirror._codeMirrorTextEditor.selection().equal(WebInspector.TextRange.createFromLocation(0, 0)))
|
| return CodeMirror.Pass;
|
| codemirror.execCommand("goPageUp");
|
| -}
|
| +};
|
|
|
| /**
|
| * @return {!Object|undefined}
|
| @@ -314,7 +314,7 @@ CodeMirror.commands.smartPageDown = function(codemirror)
|
| if (codemirror._codeMirrorTextEditor.selection().equal(codemirror._codeMirrorTextEditor.fullRange().collapseToEnd()))
|
| return CodeMirror.Pass;
|
| codemirror.execCommand("goPageDown");
|
| -}
|
| +};
|
|
|
| /**
|
| * @param {string} quoteCharacter
|
| @@ -339,7 +339,7 @@ WebInspector.CodeMirrorTextEditor._maybeAvoidSmartQuotes = function(quoteCharact
|
| if (tokenValue[0] === tokenValue[tokenValue.length - 1] && (tokenValue[0] === "'" || tokenValue[0] === "\""))
|
| return CodeMirror.Pass;
|
| codeMirror.replaceSelection(quoteCharacter);
|
| -}
|
| +};
|
| CodeMirror.commands.maybeAvoidSmartSingleQuotes = WebInspector.CodeMirrorTextEditor._maybeAvoidSmartQuotes.bind(null, "'");
|
| CodeMirror.commands.maybeAvoidSmartDoubleQuotes = WebInspector.CodeMirrorTextEditor._maybeAvoidSmartQuotes.bind(null, "\"");
|
|
|
| @@ -881,7 +881,7 @@ WebInspector.CodeMirrorTextEditor.prototype = {
|
| function innerUpdateDecorations(decoration)
|
| {
|
| if (decoration.update)
|
| - decoration.update()
|
| + decoration.update();
|
| }
|
| },
|
|
|
| @@ -902,7 +902,7 @@ WebInspector.CodeMirrorTextEditor.prototype = {
|
| if (decoration.element !== element)
|
| return;
|
| this._codeMirror.removeLineWidget(decoration.widget);
|
| - this._decorations.remove(lineNumber, decoration)
|
| + this._decorations.remove(lineNumber, decoration);
|
| }
|
| },
|
|
|
| @@ -1309,7 +1309,7 @@ WebInspector.CodeMirrorTextEditor.prototype = {
|
| },
|
|
|
| __proto__: WebInspector.VBox.prototype
|
| -}
|
| +};
|
|
|
| /**
|
| * @constructor
|
| @@ -1322,7 +1322,7 @@ WebInspector.CodeMirrorPositionHandle = function(codeMirror, pos)
|
| this._codeMirror = codeMirror;
|
| this._lineHandle = codeMirror.getLineHandle(pos.line);
|
| this._columnNumber = pos.ch;
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorPositionHandle.prototype = {
|
| /**
|
| @@ -1349,7 +1349,7 @@ WebInspector.CodeMirrorPositionHandle.prototype = {
|
| {
|
| return positionHandle._lineHandle === this._lineHandle && positionHandle._columnNumber === this._columnNumber && positionHandle._codeMirror === this._codeMirror;
|
| }
|
| -}
|
| +};
|
|
|
| /**
|
| * @constructor
|
| @@ -1400,7 +1400,7 @@ WebInspector.CodeMirrorTextEditor.FixWordMovement = function(codeMirror)
|
| keyMap["Shift-" + leftKey] = moveLeft.bind(null, true);
|
| keyMap["Shift-" + rightKey] = moveRight.bind(null, true);
|
| codeMirror.addKeyMap(keyMap);
|
| -}
|
| +};
|
|
|
| /**
|
| * @constructor
|
| @@ -1411,7 +1411,7 @@ WebInspector.CodeMirrorTextEditor.SelectNextOccurrenceController = function(text
|
| {
|
| this._textEditor = textEditor;
|
| this._codeMirror = codeMirror;
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorTextEditor.SelectNextOccurrenceController.prototype = {
|
| selectionWillChange: function()
|
| @@ -1540,7 +1540,7 @@ WebInspector.CodeMirrorTextEditor.SelectNextOccurrenceController.prototype = {
|
| return null;
|
| return new WebInspector.TextRange(matchedLineNumber, matchedColumnNumber, matchedLineNumber, matchedColumnNumber + textToFind.length);
|
| }
|
| -}
|
| +};
|
|
|
| /**
|
| * @param {string} modeName
|
| @@ -1572,12 +1572,12 @@ WebInspector.CodeMirrorTextEditor._overrideModeWithPrefixedTokens = function(mod
|
| var token = superToken(stream, state);
|
| return token ? tokenPrefix + token.split(/ +/).join(" " + tokenPrefix) : token;
|
| }
|
| -}
|
| +};
|
|
|
| /**
|
| * @interface
|
| */
|
| -WebInspector.TextEditorPositionHandle = function() {}
|
| +WebInspector.TextEditorPositionHandle = function() {};
|
|
|
| WebInspector.TextEditorPositionHandle.prototype = {
|
| /**
|
| @@ -1590,7 +1590,7 @@ WebInspector.TextEditorPositionHandle.prototype = {
|
| * @return {boolean}
|
| */
|
| equal: function(positionHandle) { }
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorTextEditor._overrideModeWithPrefixedTokens("css", "css-");
|
| WebInspector.CodeMirrorTextEditor._overrideModeWithPrefixedTokens("javascript", "js-");
|
| @@ -1644,21 +1644,21 @@ WebInspector.CodeMirrorTextEditor._loadMimeTypeModes = function(mimeType)
|
| mode.install(extension);
|
| installed.add(extension);
|
| }
|
| -}
|
| +};
|
|
|
| /**
|
| * @interface
|
| */
|
| WebInspector.CodeMirrorMimeMode = function()
|
| {
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorMimeMode.prototype = {
|
| /**
|
| * @param {!Runtime.Extension} extension
|
| */
|
| install: function(extension) { }
|
| -}
|
| +};
|
|
|
| /**
|
| * @constructor
|
| @@ -1673,7 +1673,7 @@ WebInspector.TextEditorBookMark = function(marker, type, editor)
|
| this._marker = marker;
|
| this._type = type;
|
| this._editor = editor;
|
| -}
|
| +};
|
|
|
| WebInspector.TextEditorBookMark._symbol = Symbol("WebInspector.TextEditorBookMark");
|
|
|
| @@ -1710,7 +1710,7 @@ WebInspector.TextEditorBookMark.prototype = {
|
| var pos = this._marker.find();
|
| return pos ? WebInspector.TextRange.createFromLocation(pos.line, pos.ch) : null;
|
| }
|
| -}
|
| +};
|
|
|
| /**
|
| * @typedef {{
|
| @@ -1727,7 +1727,7 @@ WebInspector.CodeMirrorTextEditor.Decoration;
|
| */
|
| WebInspector.CodeMirrorTextEditorFactory = function()
|
| {
|
| -}
|
| +};
|
|
|
| WebInspector.CodeMirrorTextEditorFactory.prototype = {
|
| /**
|
| @@ -1739,5 +1739,5 @@ WebInspector.CodeMirrorTextEditorFactory.prototype = {
|
| {
|
| return new WebInspector.CodeMirrorTextEditor(options);
|
| }
|
| -}
|
| +};
|
|
|
|
|