Changeset 233861 in webkit

Timestamp:

Jul 16, 2018 1:06:52 PM (6 years ago)

Author:

Matt Baker

Message:

Web Inspector: Fix execution highlighting after r233820
​https://bugs.webkit.org/show_bug.cgi?id=187703
<rdar://problem/42246167>

Reviewed by Joseph Pecoraro.

• UserInterface/Views/SourceCodeTextEditor.js:

(WI.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):

• UserInterface/Views/TextEditor.js:

(WI.TextEditor.prototype.currentPositionToOriginalPosition):
(WI.TextEditor.prototype._updateExecutionRangeHighlight):

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-07-16  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Fix execution highlighting after r233820
+        https://bugs.webkit.org/show_bug.cgi?id=187703
+        <rdar://problem/42246167>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WI.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
+        * UserInterface/Views/TextEditor.js:
+        (WI.TextEditor.prototype.currentPositionToOriginalPosition):
+        (WI.TextEditor.prototype._updateExecutionRangeHighlight):
+
 2018-07-16  Aaron Chu  <aaron_chu@apple.com>
 

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

@@ -1414 +1414 @@
     textEditorExecutionHighlightRange(currentPosition, callback)
     {
-        let {line, ch} = this.currentPositionToOriginalPosition(currentPosition);
-        let position = new WI.SourceCodePosition(line, ch);
+        let position = this.currentPositionToOriginalPosition(currentPosition);
 
         let script = this._getAssociatedScript(position);
@@ -1492 +1491 @@
             });
 
-            let characterAtPosition = this.getTextInRange(currentPosition, {line: currentPosition.line, ch: currentPosition.ch + 1});
+            let characterAtPosition = this.getTextInRange(currentPosition, currentPosition.offsetColumn(1));
             let characterAtPositionIsDotOrBracket = characterAtPosition === "." || characterAtPosition === "[";
 

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

@@ -785 +785 @@
             return position;
 
-        let location = this._formatterSourceMap.formattedToOriginal(position.line, position.ch);
-        return {line: location.lineNumber, ch: location.columnNumber};
+        let location = this._formatterSourceMap.formattedToOriginal(position.lineNumber, position.columnNumber);
+        return new WI.SourceCodePosition(location.lineNumber, location.columnNumber);
     }
 
@@ -1324 +1324 @@
             return;
 
-        let currentPosition = {line: this._executionLineNumber, ch: this._executionColumnNumber};
+        let currentPosition = new WI.SourceCodePosition(this._executionLineNumber, this._executionColumnNumber);
 
         this._delegate.textEditorExecutionHighlightRange(currentPosition, (range) => {