DevTools: Remove step into selection experiment

Source/devtools/front_end/JavaScriptSourceFrame.js

 /*
  * Copyright (C) 2011 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 33 matching lines @@
     if (uiSourceCode.project().type() === WebInspector.projectTypes.Debugger)
         this.element.classList.add("source-frame-debugger-script");
 
     this._popoverHelper = new WebInspector.ObjectPopoverHelper(this.textEditor.element,
             this._getPopoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), this._onHidePopover.bind(this), true);
 
     this.textEditor.element.addEventListener("keydown", this._onKeyDown.bind(this), true);
 
     this.textEditor.addEventListener(WebInspector.TextEditor.Events.GutterClick, this._handleGutterClick.bind(this), this);
 
-    this.textEditor.element.addEventListener("mousedown", this._onMouseDownAndClick.bind(this, true), true);
-    this.textEditor.element.addEventListener("click", this._onMouseDownAndClick.bind(this, false), true);
-
-
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
     this._breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
 
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.ConsoleMessageAdded, this._consoleMessageAdded, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.ConsoleMessageRemoved, this._consoleMessageRemoved, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.ConsoleMessagesCleared, this._consoleMessagesCleared, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
     this._uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
 
@@ skipping 334 matching lines @@
         this.textEditor.removeAttribute(lineNumber, "breakpoint");
         this.textEditor.removeBreakpoint(lineNumber);
     },
 
     _onKeyDown: function(event)
     {
         if (event.keyIdentifier === "U+001B") { // Escape key
             if (this._popoverHelper.isPopoverVisible()) {
                 this._popoverHelper.hidePopover();
                 event.consume();
-                return;
-            }
-            if (this._stepIntoMarkup && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event)) {
-                this._stepIntoMarkup.stoptIteratingSelection();
-                event.consume();
-                return;
             }
         }
     },
 
     /**
      * @param {number} lineNumber
      * @param {!WebInspector.BreakpointManager.Breakpoint=} breakpoint
      */
     _editBreakpointCondition: function(lineNumber, breakpoint)
     {
@@ skipping 39 matching lines @@
         editorElement.className = "monospace";
         editorElement.type = "text";
         conditionElement.appendChild(editorElement);
         this._conditionEditorElement = editorElement;
 
         return conditionElement;
     },
 
     /**
      * @param {number} lineNumber
-     * @param {!WebInspector.DebuggerModel.CallFrame} callFrame
      */
-    setExecutionLine: function(lineNumber, callFrame)
+    setExecutionLine: function(lineNumber)
     {
         this._executionLineNumber = lineNumber;
-        this._executionCallFrame = callFrame;
-        if (this.loaded) {
+        if (this.loaded)
             this.textEditor.setExecutionLine(lineNumber);
-
-            if (WebInspector.experimentsSettings.stepIntoSelection.isEnabled())
-                callFrame.getStepIntoLocations(locationsCallback.bind(this));
-        }
-
-        /**
-         * @param {!Array.<!DebuggerAgent.Location>} locations
-         * @this {WebInspector.JavaScriptSourceFrame}
-         */
-        function locationsCallback(locations)
-        {
-            if (this._executionCallFrame !== callFrame || this._stepIntoMarkup)
-                return;
-            this._stepIntoMarkup = WebInspector.JavaScriptSourceFrame.StepIntoMarkup.create(this, locations);
-            if (this._stepIntoMarkup)
-                this._stepIntoMarkup.show();
-        }
     },
 
     clearExecutionLine: function()
     {
-        if (this._stepIntoMarkup) {
-            this._stepIntoMarkup.dispose();
-            delete this._stepIntoMarkup;
-        }
-
         if (this.loaded && typeof this._executionLineNumber === "number")
             this.textEditor.clearExecutionLine();
         delete this._executionLineNumber;
-        delete this._executionCallFrame;
-    },
-
-    _onMouseDownAndClick: function(isMouseDown, event)
-    {
-        var markup = this._stepIntoMarkup;
-        if (!markup)
-            return;
-        var index = markup.findItemByCoordinates(event.x, event.y);
-        if (typeof index === "undefined")
-            return;
-
-        if (isMouseDown) {
-            // Do not let text editor to spoil 'click' event that is coming for us.
-            event.consume();
-        } else {
-            var rawLocation = markup.getRawPosition(index);
-            this._scriptsPanel.doStepIntoSelection(rawLocation);
-        }
     },
 
     /**
      * @return {boolean}
      */
     _shouldIgnoreExternalBreakpointEvents: function()
     {
         if (this._supportsEnabledBreakpointsWhileEditing())
             return false;
         if (this._muted)
@@ skipping 69 matching lines @@
             this._scriptFile.addEventListener(WebInspector.ScriptFile.Events.DidDivergeFromVM, this._didDivergeFromVM, this);
 
             if (this.loaded)
                 this._scriptFile.checkMapping();
         }
     },
 
     onTextEditorContentLoaded: function()
     {
         if (typeof this._executionLineNumber === "number")
-            this.setExecutionLine(this._executionLineNumber, this._executionCallFrame);
+            this.setExecutionLine(this._executionLineNumber);
 
         var breakpointLocations = this._breakpointManager.breakpointLocationsForUISourceCode(this._uiSourceCode);
         for (var i = 0; i < breakpointLocations.length; ++i)
             this._breakpointAdded({data:breakpointLocations[i]});
 
         var messages = this._uiSourceCode.consoleMessages();
         for (var i = 0; i < messages.length; ++i) {
             var message = messages[i];
             this.addMessageToSource(message.lineNumber, message.originalMessage);
         }
@@ skipping 68 matching lines @@
 
     /**
      * @param {number} lineNumber
      */
     _continueToLine: function(lineNumber)
     {
         var rawLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (this._uiSourceCode.uiLocationToRawLocation(lineNumber, 0));
         this._scriptsPanel.continueToLocation(rawLocation);
     },
 
-    /**
-     * @return {!WebInspector.JavaScriptSourceFrame.StepIntoMarkup|undefined}
-     */
-    stepIntoMarkup: function()
-    {
-        return this._stepIntoMarkup;
-    },
-
     dispose: function()
     {
         this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointAdded, this._breakpointAdded, this);
         this._breakpointManager.removeEventListener(WebInspector.BreakpointManager.Events.BreakpointRemoved, this._breakpointRemoved, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessageAdded, this._consoleMessageAdded, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessageRemoved, this._consoleMessageRemoved, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.ConsoleMessagesCleared, this._consoleMessagesCleared, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.SourceMappingChanged, this._onSourceMappingChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
     },
 
     __proto__: WebInspector.UISourceCodeFrame.prototype
 }
-
-/**
- * @constructor
- * @param {!Array.<!DebuggerAgent.Location>} rawPositions
- * @param {!Array.<!WebInspector.TextRange>} editorRanges
- * @param {number} firstToExecute
- * @param {!WebInspector.JavaScriptSourceFrame} sourceFrame
- */
-WebInspector.JavaScriptSourceFrame.StepIntoMarkup = function(rawPositions, editorRanges, firstToExecute, sourceFrame)
-{
-    this._positions = rawPositions;
-    this._editorRanges = editorRanges;
-    this._highlightDescriptors = new Array(rawPositions.length);
-    this._currentHighlight = undefined;
-    this._firstToExecute = firstToExecute;
-    this._currentSelection = undefined;
-    this._sourceFrame = sourceFrame;
-};
-
-WebInspector.JavaScriptSourceFrame.StepIntoMarkup.prototype = {
-    show: function()
-    {
-        var highlight = this._getVisibleHighlight();
-        for (var i = 0; i < this._positions.length; ++i)
-            this._highlightItem(i, i === highlight);
-        this._shownVisibleHighlight = highlight;
-    },
-
-    startIteratingSelection: function()
-    {
-        this._currentSelection = this._positions.length
-        this._redrawHighlight();
-    },
-
-    stopIteratingSelection: function()
-    {
-        this._currentSelection = undefined;
-        this._redrawHighlight();
-    },
-
-    /**
-     * @param {boolean} backward
-     */
-    iterateSelection: function(backward)
-    {
-        if (typeof this._currentSelection === "undefined")
-            return;
-        var nextSelection = backward ? this._currentSelection - 1 : this._currentSelection + 1;
-        var modulo = this._positions.length + 1;
-        nextSelection = (nextSelection + modulo) % modulo;
-        this._currentSelection = nextSelection;
-        this._redrawHighlight();
-    },
-
-    _redrawHighlight: function()
-    {
-        var visibleHighlight = this._getVisibleHighlight();
-        if (this._shownVisibleHighlight === visibleHighlight)
-            return;
-        this._hideItemHighlight(this._shownVisibleHighlight);
-        this._hideItemHighlight(visibleHighlight);
-        this._highlightItem(this._shownVisibleHighlight, false);
-        this._highlightItem(visibleHighlight, true);
-        this._shownVisibleHighlight = visibleHighlight;
-    },
-
-    /**
-     * @return {number}
-     */
-    _getVisibleHighlight: function()
-    {
-        return typeof this._currentSelection === "undefined" ? this._firstToExecute : this._currentSelection;
-    },
-
-    /**
-     * @param {number} position
-     * @param {boolean} selected
-     */
-    _highlightItem: function(position, selected)
-    {
-        if (position === this._positions.length)
-            return;
-        var styleName = selected ? "source-frame-stepin-mark-highlighted" : "source-frame-stepin-mark";
-        var textEditor = this._sourceFrame.textEditor;
-        var highlightDescriptor = textEditor.highlightRange(this._editorRanges[position], styleName);
-        this._highlightDescriptors[position] = highlightDescriptor;
-    },
-
-    /**
-     * @param {number} position
-     */
-    _hideItemHighlight: function(position)
-    {
-        if (position === this._positions.length)
-            return;
-        var highlightDescriptor = this._highlightDescriptors[position];
-        console.assert(highlightDescriptor);
-        var textEditor = this._sourceFrame.textEditor;
-        textEditor.removeHighlight(highlightDescriptor);
-        this._highlightDescriptors[position] = undefined;
-    },
-
-    dispose: function()
-    {
-        for (var i = 0; i < this._positions.length; ++i)
-            this._hideItemHighlight(i);
-    },
-
-    /**
-     * @param {number} x
-     * @param {number} y
-     * @return {number|undefined}
-     */
-    findItemByCoordinates: function(x, y)
-    {
-        var textPosition = this._sourceFrame.textEditor.coordinatesToCursorPosition(x, y);
-        if (!textPosition)
-            return;
-
-        var ranges = this._editorRanges;
-
-        for (var i = 0; i < ranges.length; ++i) {
-          var nextRange = ranges[i];
-          if (nextRange.startLine == textPosition.startLine && nextRange.startColumn <= textPosition.startColumn && nextRange.endColumn >= textPosition.startColumn)
-              return i;
-        }
-    },
-
-    /**
-     * @return {number|undefined}
-     */
-    getSelectedItemIndex: function()
-    {
-        if (this._currentSelection === this._positions.length)
-            return undefined;
-        return this._currentSelection;
-    },
-
-    /**
-     * @return {!WebInspector.DebuggerModel.Location}
-     */
-    getRawPosition: function(position)
-    {
-        return /** @type {!WebInspector.DebuggerModel.Location} */ (this._positions[position]);
-    }
-
-};
-
-/**
- * @param {!WebInspector.JavaScriptSourceFrame} sourceFrame
- * @param {!Array.<!DebuggerAgent.Location>} stepIntoRawLocations
- * @return {?WebInspector.JavaScriptSourceFrame.StepIntoMarkup}
- */
-WebInspector.JavaScriptSourceFrame.StepIntoMarkup.create = function(sourceFrame, stepIntoRawLocations)
-{
-    if (!stepIntoRawLocations.length)
-        return null;
-
-    var firstToExecute = stepIntoRawLocations[0];
-    stepIntoRawLocations.sort(WebInspector.JavaScriptSourceFrame.StepIntoMarkup._Comparator);
-    var firstToExecuteIndex = stepIntoRawLocations.indexOf(firstToExecute);
-
-    var textEditor = sourceFrame.textEditor;
-    var uiRanges = [];
-    for (var i = 0; i < stepIntoRawLocations.length; ++i) {
-        var uiLocation = WebInspector.debuggerModel.rawLocationToUILocation(/** @type {!WebInspector.DebuggerModel.Location} */ (stepIntoRawLocations[i]));
-
-        var token = textEditor.tokenAtTextPosition(uiLocation.lineNumber, uiLocation.columnNumber);
-        var startColumn;
-        var endColumn;
-        if (token) {
-            startColumn = token.startColumn;
-            endColumn = token.endColumn;
-        } else {
-            startColumn = uiLocation.columnNumber;
-            endColumn = uiLocation.columnNumber;
-        }
-        var range = new WebInspector.TextRange(uiLocation.lineNumber, startColumn, uiLocation.lineNumber, endColumn);
-        uiRanges.push(range);
-    }
-
-    return new WebInspector.JavaScriptSourceFrame.StepIntoMarkup(stepIntoRawLocations, uiRanges, firstToExecuteIndex, sourceFrame);
-};
-
-/**
- * @param {!DebuggerAgent.Location} locationA
- * @param {!DebuggerAgent.Location} locationB
- * @return {number}
- */
-WebInspector.JavaScriptSourceFrame.StepIntoMarkup._Comparator = function(locationA, locationB)
-{
-    if (locationA.lineNumber === locationB.lineNumber)
-        return locationA.columnNumber - locationB.columnNumber;
-    else
-        return locationA.lineNumber - locationB.lineNumber;
-};