<!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>[181331] 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/181331">181331</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-03-10 11:47:04 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Destructuring function parameters should show type information
https://bugs.webkit.org/show_bug.cgi?id=142233
Reviewed by Joseph Pecoraro.
JSC supports a function's formal parameter being a destructuring pattern,
and so should the type profiler in the Inspector. This was just an oversight
not to have this in bug 141215.
This patch also does a bit of refactoring to not have duplicate code
that traverses AST nodes in TypeTokenAnnotator and ScriptSyntaxTree.
Before, both of these classes were responsible for traversing the AST
in an identical way, this is bad. Now, ScriptSyntaxTree contains the
canonical implementation of how the AST should be traversed and which
AST nodes should be collected for type profiling. ScriptSyntaxTree will
pass this information back to TypeTokenAnnotator.
* UserInterface/Controllers/TypeTokenAnnotator.js:
(WebInspector.TypeTokenAnnotator.prototype._insertTypeToken):
(WebInspector.TypeTokenAnnotator.prototype._insertTypeTokensForEachNode): Deleted.
* UserInterface/Models/ScriptSyntaxTree.js:
(WebInspector.ScriptSyntaxTree.prototype.):
(WebInspector.ScriptSyntaxTree.prototype.updateTypes):
(WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration):
(WebInspector.ScriptSyntaxTree.prototype.gatherIdentifiersInVariableDeclaration): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTypeTokenAnnotatorjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TypeTokenAnnotator.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181330 => 181331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-10 18:17:18 UTC (rev 181330)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-10 18:47:04 UTC (rev 181331)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-03-10 Saam Barati <saambarati1@gmail.com>
+
+ Web Inspector: Destructuring function parameters should show type information
+ https://bugs.webkit.org/show_bug.cgi?id=142233
+
+ Reviewed by Joseph Pecoraro.
+
+ JSC supports a function's formal parameter being a destructuring pattern,
+ and so should the type profiler in the Inspector. This was just an oversight
+ not to have this in bug 141215.
+
+ This patch also does a bit of refactoring to not have duplicate code
+ that traverses AST nodes in TypeTokenAnnotator and ScriptSyntaxTree.
+ Before, both of these classes were responsible for traversing the AST
+ in an identical way, this is bad. Now, ScriptSyntaxTree contains the
+ canonical implementation of how the AST should be traversed and which
+ AST nodes should be collected for type profiling. ScriptSyntaxTree will
+ pass this information back to TypeTokenAnnotator.
+
+ * UserInterface/Controllers/TypeTokenAnnotator.js:
+ (WebInspector.TypeTokenAnnotator.prototype._insertTypeToken):
+ (WebInspector.TypeTokenAnnotator.prototype._insertTypeTokensForEachNode): Deleted.
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ (WebInspector.ScriptSyntaxTree.prototype.):
+ (WebInspector.ScriptSyntaxTree.prototype.updateTypes):
+ (WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration):
+ (WebInspector.ScriptSyntaxTree.prototype.gatherIdentifiersInVariableDeclaration): Deleted.
+
</ins><span class="cx"> 2015-03-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Inline Error / Warning message for Issues
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTypeTokenAnnotatorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TypeTokenAnnotator.js (181330 => 181331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TypeTokenAnnotator.js 2015-03-10 18:17:18 UTC (rev 181330)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TypeTokenAnnotator.js 2015-03-10 18:47:04 UTC (rev 181331)
</span><span class="lines">@@ -62,12 +62,12 @@
</span><span class="cx">
</span><span class="cx"> var startTime = Date.now();
</span><span class="cx"> var allNodesInRange = scriptSyntaxTree.filterByRange(startOffset, endOffset);
</span><del>- scriptSyntaxTree.updateTypes(allNodesInRange, function afterTypeUpdates() {
</del><ins>+ scriptSyntaxTree.updateTypes(allNodesInRange, function afterTypeUpdates(nodesWithUpdatedTypes) {
</ins><span class="cx"> // Because this is an asynchronous call, we could have been deactivated before the callback function is called.
</span><span class="cx"> if (!this.isActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- allNodesInRange.forEach(this._insertTypeTokensForEachNode, this);
</del><ins>+ nodesWithUpdatedTypes.forEach(this._insertTypeToken, this);
</ins><span class="cx">
</span><span class="cx"> var totalTime = Date.now() - startTime;
</span><span class="cx"> var timeoutTime = Math.min(Math.max(7500, totalTime), 8 * totalTime);
</span><span class="lines">@@ -86,47 +86,35 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _insertTypeTokensForEachNode: function(node)
</del><ins>+ _insertTypeToken: function(node)
</ins><span class="cx"> {
</span><del>- var scriptSyntaxTree = this._script._scriptSyntaxTree;
</del><ins>+ if (node.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier) {
+ if (!node.attachments.__typeToken && node.attachments.types && node.attachments.types.isValid)
+ this._insertToken(node.range[0], node, false, WebInspector.TypeTokenView.TitleType.Variable, node.name);
</ins><span class="cx">
</span><del>- switch (node.type) {
- case WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration:
- case WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression:
- for (var param of node.params) {
- if (!param.attachments.__typeToken && param.attachments.types && param.attachments.types.isValid)
- this._insertToken(param.range[0], param, false, WebInspector.TypeTokenView.TitleType.Variable, param.name);
-
- if (param.attachments.__typeToken)
- param.attachments.__typeToken.update(param.attachments.types);
- }
-
- // If a function does not have an explicit return type, then don't show a return type unless we think it's a constructor.
- var functionReturnType = node.attachments.returnTypes;
- if (node.attachments.__typeToken || !functionReturnType || !functionReturnType.isValid)
- break;
-
- if (scriptSyntaxTree.containsNonEmptyReturnStatement(node.body) || !WebInspector.TypeSet.fromPayload(functionReturnType).isContainedIn(WebInspector.TypeSet.TypeBit.Undefined)) {
- var functionName = node.id ? node.id.name : null;
- this._insertToken(node.isGetterOrSetter ? node.getterOrSetterRange[0] : node.range[0], node, true, WebInspector.TypeTokenView.TitleType.ReturnStatement, functionName);
- }
-
</del><span class="cx"> if (node.attachments.__typeToken)
</span><del>- node.attachments.__typeToken.update(node.attachments.returnTypes);
</del><ins>+ node.attachments.__typeToken.update(node.attachments.types);
</ins><span class="cx">
</span><del>- break;
- case WebInspector.ScriptSyntaxTree.NodeType.VariableDeclarator:
- var identifiers = scriptSyntaxTree.gatherIdentifiersInVariableDeclaration(node);
- for (identifier of identifiers) {
- if (!identifier.attachments.__typeToken && identifier.attachments.types && identifier.attachments.types.isValid)
- this._insertToken(identifier.range[0], identifier, false, WebInspector.TypeTokenView.TitleType.Variable, identifier.name);
</del><ins>+ return;
+ }
</ins><span class="cx">
</span><del>- if (identifier.attachments.__typeToken)
- identifier.attachments.__typeToken.update(identifier.attachments.types);
- }
</del><ins>+ console.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration || node.type === WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression);
</ins><span class="cx">
</span><del>- break;
</del><ins>+ var functionReturnType = node.attachments.returnTypes;
+ if (!functionReturnType || !functionReturnType.isValid)
+ return;
+
+ // If a function does not have an explicit return statement with an argument (i.e, "return x;" instead of "return;")
+ // then don't show a return type unless we think it's a constructor.
+ var scriptSyntaxTree = this._script._scriptSyntaxTree;
+ if (!node.attachments.__typeToken && (scriptSyntaxTree.containsNonEmptyReturnStatement(node.body) || !WebInspector.TypeSet.fromPayload(functionReturnType).isContainedIn(WebInspector.TypeSet.TypeBit.Undefined))) {
+ var functionName = node.id ? node.id.name : null;
+ var offset = node.isGetterOrSetter ? node.getterOrSetterRange[0] : node.range[0];
+ this._insertToken(offset, node, true, WebInspector.TypeTokenView.TitleType.ReturnStatement, functionName);
</ins><span class="cx"> }
</span><ins>+
+ if (node.attachments.__typeToken)
+ node.attachments.__typeToken.update(node.attachments.returnTypes);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _insertToken: function(originalOffset, node, shouldTranslateOffsetToAfterParameterList, typeTokenTitleType, functionOrVariableName)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (181330 => 181331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-10 18:17:18 UTC (rev 181330)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2015-03-10 18:47:04 UTC (rev 181331)
</span><span class="lines">@@ -216,12 +216,14 @@
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression:
</span><span class="cx"> for (var param of node.params) {
</span><del>- allRequests.push({
- typeInformationDescriptor: WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor.NormalExpression,
- sourceID,
- divot: param.range[0]
- });
- allRequestNodes.push(param);
</del><ins>+ for (var identifier of this._gatherIdentifiersInDeclaration(param)) {
+ allRequests.push({
+ typeInformationDescriptor: WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor.NormalExpression,
+ sourceID,
+ divot: identifier.range[0]
+ });
+ allRequestNodes.push(identifier);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> allRequests.push({
</span><span class="lines">@@ -232,7 +234,7 @@
</span><span class="cx"> allRequestNodes.push(node);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.VariableDeclarator:
</span><del>- for (var identifier of this.gatherIdentifiersInVariableDeclaration(node)) {
</del><ins>+ for (var identifier of this._gatherIdentifiersInDeclaration(node.id)) {
</ins><span class="cx"> allRequests.push({
</span><span class="cx"> typeInformationDescriptor: WebInspector.ScriptSyntaxTree.TypeProfilerSearchDescriptor.NormalExpression,
</span><span class="cx"> sourceID,
</span><span class="lines">@@ -262,13 +264,16 @@
</span><span class="cx"> node.attachments.types = typeInformation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callback();
</del><ins>+ callback(allRequestNodes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handleTypes);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- gatherIdentifiersInVariableDeclaration: function (node) {
</del><ins>+ // Private
+
+ _gatherIdentifiersInDeclaration: function(node)
+ {
</ins><span class="cx"> function gatherIdentifiers(node)
</span><span class="cx"> {
</span><span class="cx"> switch (node.type) {
</span><span class="lines">@@ -291,17 +296,16 @@
</span><span class="cx"> }
</span><span class="cx"> return identifiers;
</span><span class="cx"> default:
</span><del>- console.assert(false, "Unexecpted node type in variable declarator: " + node.type);
</del><ins>+ console.assert(false, "Unexpected node type in variable declarator: " + node.type);
</ins><span class="cx"> return [];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- console.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.VariableDeclarator);
- return gatherIdentifiers(node.id);
</del><ins>+ console.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier || node.type === WebInspector.ScriptSyntaxTree.NodeType.ObjectPattern || node.type === WebInspector.ScriptSyntaxTree.NodeType.ArrayPattern);
+
+ return gatherIdentifiers(node);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- // Private
-
</del><span class="cx"> _defaultParserState: function()
</span><span class="cx"> {
</span><span class="cx"> return {
</span></span></pre>
</div>
</div>
</body>
</html>