<!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>[206655] 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/206655">206655</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-30 12:24:32 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make debugger stepping highlights work in inline <script>s
https://bugs.webkit.org/show_bug.cgi?id=162753
<rdar://problem/28551332>
Reviewed by Brian Burg.
* UserInterface/Models/TextRange.js:
(WebInspector.TextRange.prototype.contains):
Check if a given line/column falls within this range.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._getAssociatedScript):
If we are in a Document resource find the associated script at a given position.
(WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
When comparing offsets to SyntaxTree offsets, the SyntaxTree's offset of 0 is the
first character of the Script, which differs from the current SourceCode's offset.
Adjust the offset by the Script's startOffset.
* UserInterface/Views/TextEditor.js:
(WebInspector.TextEditor.prototype.currentPositionToOriginalPosition):
(WebInspector.TextEditor.prototype._updateExecutionRangeHighlight):
Pass both the original offset and original position to the delegate.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersFormatterSourceMapjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsTextRangejs">trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js</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 (206654 => 206655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-09-30 19:24:29 UTC (rev 206654)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-09-30 19:24:32 UTC (rev 206655)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Make debugger stepping highlights work in inline <script>s
+ https://bugs.webkit.org/show_bug.cgi?id=162753
+ <rdar://problem/28551332>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Models/TextRange.js:
+ (WebInspector.TextRange.prototype.contains):
+ Check if a given line/column falls within this range.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._getAssociatedScript):
+ If we are in a Document resource find the associated script at a given position.
+
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorExecutionHighlightRange):
+ When comparing offsets to SyntaxTree offsets, the SyntaxTree's offset of 0 is the
+ first character of the Script, which differs from the current SourceCode's offset.
+ Adjust the offset by the Script's startOffset.
+
+ * UserInterface/Views/TextEditor.js:
+ (WebInspector.TextEditor.prototype.currentPositionToOriginalPosition):
+ (WebInspector.TextEditor.prototype._updateExecutionRangeHighlight):
+ Pass both the original offset and original position to the delegate.
+
+2016-09-30 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Stepping through `a(); b(); c();` it is unclear where we are and what is about to execute
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161658
</span><span class="cx"> <rdar://problem/28181254>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersFormatterSourceMapjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js (206654 => 206655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js 2016-09-30 19:24:29 UTC (rev 206654)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FormatterSourceMap.js 2016-09-30 19:24:32 UTC (rev 206655)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> return this._positionToLocation(this._formattedLineEndings, formattedPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> formattedToOriginal(lineNumber, columnNumber)
</span><span class="cx"> {
</span><span class="cx"> var originalPosition = this.formattedToOriginalOffset(lineNumber, columnNumber);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsTextRangejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js (206654 => 206655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js 2016-09-30 19:24:29 UTC (rev 206654)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/TextRange.js 2016-09-30 19:24:32 UTC (rev 206655)
</span><span class="lines">@@ -96,4 +96,18 @@
</span><span class="cx">
</span><span class="cx"> this._endOffset = lastNewLineOffset + this._endColumn;
</span><span class="cx"> }
</span><ins>+
+ contains(line, column)
+ {
+ console.assert(!isNaN(this._startLine), "TextRange needs line/column data");
+
+ if (line < this._startLine || line > this._endLine)
+ return false;
+ if (line === this._startLine && column < this._startColumn)
+ return false;
+ if (line === this._endLine && column > this._endColumn)
+ return false;
+
+ return true;
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (206654 => 206655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-09-30 19:24:29 UTC (rev 206654)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-09-30 19:24:32 UTC (rev 206655)
</span><span class="lines">@@ -1210,14 +1210,23 @@
</span><span class="cx"> this._reinsertAllIssues();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- textEditorExecutionHighlightRange(offset, callback)
</del><ins>+ textEditorExecutionHighlightRange(offset, position, callback)
</ins><span class="cx"> {
</span><del>- let script = this._getAssociatedScript();
</del><ins>+ let script = this._getAssociatedScript(position);
</ins><span class="cx"> if (!script) {
</span><span class="cx"> callback(null);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If this is an inline script, then convert to offset within the inline script.
+ let adjustment = script.range.startOffset || 0;
+ offset = offset - adjustment;
+
+ // When returning offsets, convert to offsets within the SourceCode being viewed.
+ function convertRangeOffsetsToSourceCodeOffsets(range) {
+ return range.map((offset) => offset + adjustment);
+ }
+
</ins><span class="cx"> script.requestScriptSyntaxTree((syntaxTree) => {
</span><span class="cx"> let nodes = syntaxTree.containersOfOffset(offset);
</span><span class="cx"> if (!nodes.length) {
</span><span class="lines">@@ -1229,7 +1238,7 @@
</span><span class="cx"> for (let node of nodes) {
</span><span class="cx"> let startOffset = node.range[0];
</span><span class="cx"> if (startOffset === offset) {
</span><del>- callback(node.range);
</del><ins>+ callback(convertRangeOffsetsToSourceCodeOffsets(node.range));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (startOffset > offset)
</span><span class="lines">@@ -1245,7 +1254,7 @@
</span><span class="cx"> if (endOffset === offset) {
</span><span class="cx"> if (node.type === WebInspector.ScriptSyntaxTree.NodeType.BlockStatement) {
</span><span class="cx"> // Closing brace of a block, only highlight the closing brace character.
</span><del>- callback([offset - 1, offset]);
</del><ins>+ callback(convertRangeOffsetsToSourceCodeOffsets([offset - 1, offset]));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1267,7 +1276,7 @@
</span><span class="cx"> // In a function call.
</span><span class="cx"> if (node.type === WebInspector.ScriptSyntaxTree.NodeType.CallExpression
</span><span class="cx"> || node.type === WebInspector.ScriptSyntaxTree.NodeType.NewExpression) {
</span><del>- callback(node.range);
</del><ins>+ callback(convertRangeOffsetsToSourceCodeOffsets(node.range));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1276,10 +1285,10 @@
</span><span class="cx"> || node.type === WebInspector.ScriptSyntaxTree.NodeType.IdentifierExpression) {
</span><span class="cx"> let nextNode = nodes[i + 1];
</span><span class="cx"> if (nextNode && nextNode.type === WebInspector.ScriptSyntaxTree.NodeType.MemberExpression) {
</span><del>- callback(nextNode.range);
</del><ins>+ callback(convertRangeOffsetsToSourceCodeOffsets(nextNode.range));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- callback(node.range);
</del><ins>+ callback(convertRangeOffsetsToSourceCodeOffsets(node.range));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1852,14 +1861,27 @@
</span><span class="cx"> WebInspector.enableControlFlowProfilerSetting.value = shouldActivate;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _getAssociatedScript()
</del><ins>+ _getAssociatedScript(position)
</ins><span class="cx"> {
</span><del>- var script = null;
- // FIXME: This needs to me modified to work with HTML files with inline script tags.
</del><ins>+ let script = null;
+
</ins><span class="cx"> if (this._sourceCode instanceof WebInspector.Script)
</span><span class="cx"> script = this._sourceCode;
</span><del>- else if (this._sourceCode instanceof WebInspector.Resource && this._sourceCode.type === WebInspector.Resource.Type.Script && this._sourceCode.scripts.length)
- script = this._sourceCode.scripts[0];
</del><ins>+ else if (this._sourceCode instanceof WebInspector.Resource && this._sourceCode.scripts.length) {
+ if (this._sourceCode.type === WebInspector.Resource.Type.Script)
+ script = this._sourceCode.scripts[0];
+ else if (this._sourceCode.type === WebInspector.Resource.Type.Document && position) {
+ for (let inlineScript of this._sourceCode.scripts) {
+ if (inlineScript.range.contains(position.lineNumber, position.columnNumber)) {
+ if (isNaN(inlineScript.range.startOffset))
+ inlineScript.range.resolveOffsets(this._sourceCode.content);
+ script = inlineScript;
+ break;
+ }
+ }
+ }
+ }
+
</ins><span class="cx"> return script;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (206654 => 206655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2016-09-30 19:24:29 UTC (rev 206654)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2016-09-30 19:24:32 UTC (rev 206655)
</span><span class="lines">@@ -708,6 +708,15 @@
</span><span class="cx"> return offset;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ currentPositionToOriginalPosition(position)
+ {
+ if (!this._formatterSourceMap)
+ return position;
+
+ let location = this._formatterSourceMap.formattedToOriginal(position.line, position.ch);
+ return {line: location.lineNumber, ch: location.columnNumber};
+ }
+
</ins><span class="cx"> currentPositionToCurrentOffset(position)
</span><span class="cx"> {
</span><span class="cx"> return this._codeMirror.getDoc().indexFromPos(position);
</span><span class="lines">@@ -1225,9 +1234,12 @@
</span><span class="cx"> if (isNaN(this._executionLineNumber))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let offset = this.currentPositionToOriginalOffset({line: this._executionLineNumber, ch: this._executionColumnNumber});
</del><ins>+ let currentPosition = {line: this._executionLineNumber, ch: this._executionColumnNumber};
+ let originalOffset = this.currentPositionToOriginalOffset(currentPosition);
+ let originalCodeMirrorPosition = this.currentPositionToOriginalPosition(currentPosition);
+ let originalPosition = new WebInspector.SourceCodePosition(originalCodeMirrorPosition.line, originalCodeMirrorPosition.ch);
</ins><span class="cx">
</span><del>- this._delegate.textEditorExecutionHighlightRange(offset, (range) => {
</del><ins>+ this._delegate.textEditorExecutionHighlightRange(originalOffset, originalPosition, (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>