Changeset 207227 in webkit

Timestamp:

Oct 12, 2016 11:43:19 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Whole program sometimes highlighted instead of just first statement
​https://bugs.webkit.org/show_bug.cgi?id=163300
<rdar://problem/28723162>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-10-12
Reviewed by Timothy Hatcher.

• UserInterface/Views/SourceCodeTextEditor.js:

(WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
Avoid highlighting the entire program by skipping a Program type Node.

• UserInterface/Views/TextEditor.js:

(WebInspector.TextEditor.prototype.setExecutionLineAndColumn):
Avoid unnecessary work before content has loaded.

(WebInspector.TextEditor.prototype.currentPositionToOriginalOffset):
Avoid unnecessary indirection to get the CodeMirror editor.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/SourceCodeTextEditor.js (modified) (1 diff)
• UserInterface/Views/TextEditor.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-10-12  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Whole program sometimes highlighted instead of just first statement
+        https://bugs.webkit.org/show_bug.cgi?id=163300
+        <rdar://problem/28723162>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
+        Avoid highlighting the entire program by skipping a Program type Node.
+
+        * UserInterface/Views/TextEditor.js:
+        (WebInspector.TextEditor.prototype.setExecutionLineAndColumn):
+        Avoid unnecessary work before content has loaded.
+
+        (WebInspector.TextEditor.prototype.currentPositionToOriginalOffset):
+        Avoid unnecessary indirection to get the CodeMirror editor.
+
 2016-10-11  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js

@@ -1236 +1236 @@
 
             // Find a node starting at this offset.
+            // Avoid highlighting the entire program if this is the start of the first statement.
             for (let node of nodes) {
                 let startOffset = node.range[0];
-                if (startOffset === offset) {
+                if (startOffset === offset && node.type !== WebInspector.ScriptSyntaxTree.NodeType.Program) {
                     callback(convertRangeOffsetsToSourceCodeOffsets(node.range));
                     return;

trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js

@@ -337 +337 @@
         this._executionColumnNumber = columnNumber;
 
-        this._updateExecutionLine();
-        this._updateExecutionRangeHighlight();
+        if (!this._initialStringNotSet) {
+            this._updateExecutionLine();
+            this._updateExecutionRangeHighlight();
+        }
 
         // Still dispatch the event even if the number didn't change. The execution state still
@@ -704 +706 @@
             offset = this._formatterSourceMap.formattedToOriginalOffset(position.line, position.ch);
         else
-            offset = this.tokenTrackingController._codeMirror.getDoc().indexFromPos(position);
+            offset = this._codeMirror.getDoc().indexFromPos(position);
 
         return offset;