<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207358] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207358">207358</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-14 16:04:04 -0700 (Fri, 14 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve debugger highlight when inside of getter/setter calls
https://bugs.webkit.org/show_bug.cgi?id=163428
<rdar://problem/28769061>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-10-14
Reviewed by Timothy Hatcher.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
When in the middle of a member expression at a '.' or '[' get the best member
expression range.
* UserInterface/Views/TextEditor.js:
(WebInspector.TextEditor.prototype._updateExecutionRangeHighlight):
Include the character at the current position. This is useful since AST Nodes
don't give us token info but we would like to know if we are at particular tokens.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (207357 => 207358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-10-14 22:42:14 UTC (rev 207357)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-10-14 23:04:04 UTC (rev 207358)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-10-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Improve debugger highlight when inside of getter/setter calls
+ https://bugs.webkit.org/show_bug.cgi?id=163428
+ <rdar://problem/28769061>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
+ When in the middle of a member expression at a '.' or '[' get the best member
+ expression range.
+
+ * UserInterface/Views/TextEditor.js:
+ (WebInspector.TextEditor.prototype._updateExecutionRangeHighlight):
+ Include the character at the current position. This is useful since AST Nodes
+ don't give us token info but we would like to know if we are at particular tokens.
+
+2016-10-14 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Unused Breakpoint getter/setter for "id" - should be "identifier"
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163395
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (207357 => 207358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-10-14 22:42:14 UTC (rev 207357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-10-14 23:04:04 UTC (rev 207358)
</span><span class="lines">@@ -1215,7 +1215,7 @@
</span><span class="cx"> this._reinsertAllIssues();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- textEditorExecutionHighlightRange(offset, position, callback)
</del><ins>+ textEditorExecutionHighlightRange(offset, position, characterAtOffset, callback)
</ins><span class="cx"> {
</span><span class="cx"> let script = this._getAssociatedScript(position);
</span><span class="cx"> if (!script) {
</span><span class="lines">@@ -1283,6 +1283,8 @@
</span><span class="cx"> return aLength - bLength;
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ let characterAtOffsetIsDotOrBracket = characterAtOffset === "." || characterAtOffset === "[";
+
</ins><span class="cx"> for (let i = 0; i < nodes.length; ++i) {
</span><span class="cx"> let node = nodes[i];
</span><span class="cx">
</span><span class="lines">@@ -1293,14 +1295,38 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // In the middle of a member expression.
</del><ins>+ // In the middle of a member expression we want to highlight the best
+ // member expression range. We can end up in the middle when we are
+ // paused inside of a getter and select the parent call frame. For
+ // these cases we may be at a '.' or '[' and we can find the best member
+ // expression from there.
+ //
+ // Examples:
+ //
+ // foo*.x.y.z => inside x looking at parent call frame => |foo.x|.y.z
+ // foo.x*.y.z => inside y looking at parent call frame => |foo.x.y|.z
+ //
+ // foo*["x"]["y"]["z"] => inside x looking at parent call frame => |foo["x"]|["y"]["z"]
+ // foo["x"]*["y"]["z"] => inside y looking at parent call frame => |foo["x"]["y"]|["z"]
+ //
</ins><span class="cx"> if (node.type === WebInspector.ScriptSyntaxTree.NodeType.ThisExpression
</span><del>- || node.type === WebInspector.ScriptSyntaxTree.NodeType.IdentifierExpression) {
- let nextNode = nodes[i + 1];
- if (nextNode && nextNode.type === WebInspector.ScriptSyntaxTree.NodeType.MemberExpression) {
- callback(convertRangeOffsetsToSourceCodeOffsets(nextNode.range));
</del><ins>+ || (characterAtOffsetIsDotOrBracket && (node.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier || node.type === WebInspector.ScriptSyntaxTree.NodeType.MemberExpression))) {
+ let memberExpressionNode = null;
+ for (let j = i + 1; j < nodes.length; ++j) {
+ let nextNode = nodes[j];
+ if (nextNode.type === WebInspector.ScriptSyntaxTree.NodeType.MemberExpression) {
+ memberExpressionNode = nextNode;
+ if (offset === memberExpressionNode.range[1])
+ continue;
+ }
+ break;
+ }
+
+ if (memberExpressionNode) {
+ callback(convertRangeOffsetsToSourceCodeOffsets(memberExpressionNode.range));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> callback(convertRangeOffsetsToSourceCodeOffsets(node.range));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (207357 => 207358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2016-10-14 22:42:14 UTC (rev 207357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2016-10-14 23:04:04 UTC (rev 207358)
</span><span class="lines">@@ -1241,8 +1241,9 @@
</span><span class="cx"> let originalOffset = this.currentPositionToOriginalOffset(currentPosition);
</span><span class="cx"> let originalCodeMirrorPosition = this.currentPositionToOriginalPosition(currentPosition);
</span><span class="cx"> let originalPosition = new WebInspector.SourceCodePosition(originalCodeMirrorPosition.line, originalCodeMirrorPosition.ch);
</span><ins>+ let characterAtOffset = this._codeMirror.getRange(currentPosition, {line: this._executionLineNumber, ch: this._executionColumnNumber + 1});
</ins><span class="cx">
</span><del>- this._delegate.textEditorExecutionHighlightRange(originalOffset, originalPosition, (range) => {
</del><ins>+ this._delegate.textEditorExecutionHighlightRange(originalOffset, originalPosition, characterAtOffset, (range) => {
</ins><span class="cx"> let start, end;
</span><span class="cx"> if (!range) {
</span><span class="cx"> // Highlight the rest of the line.
</span></span></pre>
</div>
</div>
</body>
</html>