<!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>[198925] trunk</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/198925">198925</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-31 15:50:33 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ScriptSyntaxTree doesn't handle RestElement AST nodes
https://bugs.webkit.org/show_bug.cgi?id=156085
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-31
Reviewed by Saam Barati.
Source/WebInspectorUI:
* UserInterface/Models/ScriptSyntaxTree.js:
(WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration.gatherIdentifiers):
(WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration):
When searching for identifiers in Function parameters, pass
through the RestElement to its argument.
(WebInspector.ScriptSyntaxTree.prototype._recurse):
(WebInspector.ScriptSyntaxTree.prototype._createInternalSyntaxTree):
Create a ScriptSyntaxTree RestElement node.
Also, every case in recurse visits the current
node, so simplify the code!
LayoutTests:
* inspector/model/parse-script-syntax-tree-expected.txt:
* inspector/model/parse-script-syntax-tree.html:
Add a test for a RestElement.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectormodelparsescriptsyntaxtreeexpectedtxt">trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml">trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198924 => 198925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-31 22:43:45 UTC (rev 198924)
+++ trunk/LayoutTests/ChangeLog 2016-03-31 22:50:33 UTC (rev 198925)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-31 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ScriptSyntaxTree doesn't handle RestElement AST nodes
+ https://bugs.webkit.org/show_bug.cgi?id=156085
+
+ Reviewed by Saam Barati.
+
+ * inspector/model/parse-script-syntax-tree-expected.txt:
+ * inspector/model/parse-script-syntax-tree.html:
+ Add a test for a RestElement.
+
</ins><span class="cx"> 2016-03-31 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r195605): ASSERTION FAILED: !NoEventDispatchAssertion::isEventDispatchForbidden()
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelparsescriptsyntaxtreeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt (198924 => 198925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt 2016-03-31 22:43:45 UTC (rev 198924)
+++ trunk/LayoutTests/inspector/model/parse-script-syntax-tree-expected.txt 2016-03-31 22:50:33 UTC (rev 198925)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> passed NewExpression
</span><span class="cx"> passed ObjectExpression
</span><span class="cx"> passed Property
</span><ins>+passed RestStatement
</ins><span class="cx"> passed ReturnStatement
</span><span class="cx"> passed SequenceExpression
</span><span class="cx"> passed SwitchStatement
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelparsescriptsyntaxtreehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html (198924 => 198925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html 2016-03-31 22:43:45 UTC (rev 198924)
+++ trunk/LayoutTests/inspector/model/parse-script-syntax-tree.html 2016-03-31 22:50:33 UTC (rev 198925)
</span><span class="lines">@@ -321,6 +321,13 @@
</span><span class="cx"> InspectorTest.assert(node.right.properties[0].key.type === WebInspector.ScriptSyntaxTree.NodeType.Literal);
</span><span class="cx"> InspectorTest.log("passed Property");
</span><span class="cx">
</span><ins>+ node = makeNode("function foo(...things) { return things; }", false);
+ InspectorTest.assert(node.params.length === 1);
+ InspectorTest.assert(node.params[0].type === WebInspector.ScriptSyntaxTree.NodeType.RestElement);
+ InspectorTest.assert(node.params[0].argument.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier);
+ InspectorTest.assert(node.params[0].argument.name === "things");
+ InspectorTest.log("passed RestStatement");
+
</ins><span class="cx"> node = makeNode("function foo() { return 20; }", false);
</span><span class="cx"> InspectorTest.assert(node.body.body[0].type === WebInspector.ScriptSyntaxTree.NodeType.ReturnStatement);
</span><span class="cx"> InspectorTest.assert(node.body.body[0].argument.type === WebInspector.ScriptSyntaxTree.NodeType.Literal);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198924 => 198925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-31 22:43:45 UTC (rev 198924)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-31 22:50:33 UTC (rev 198925)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-31 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ScriptSyntaxTree doesn't handle RestElement AST nodes
+ https://bugs.webkit.org/show_bug.cgi?id=156085
+
+ Reviewed by Saam Barati.
+
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ (WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration.gatherIdentifiers):
+ (WebInspector.ScriptSyntaxTree.prototype._gatherIdentifiersInDeclaration):
+ When searching for identifiers in Function parameters, pass
+ through the RestElement to its argument.
+
+ (WebInspector.ScriptSyntaxTree.prototype._recurse):
+ (WebInspector.ScriptSyntaxTree.prototype._createInternalSyntaxTree):
+ Create a ScriptSyntaxTree RestElement node.
+ Also, every case in recurse visits the current
+ node, so simplify the code!
+
</ins><span class="cx"> 2016-03-30 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused ScriptProfiler.Samples.totalTime
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (198924 => 198925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2016-03-31 22:43:45 UTC (rev 198924)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2016-03-31 22:50:33 UTC (rev 198925)
</span><span class="lines">@@ -261,13 +261,15 @@
</span><span class="cx"> return identifiers;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.AssignmentPattern:
</span><span class="cx"> return gatherIdentifiers(node.left);
</span><ins>+ case WebInspector.ScriptSyntaxTree.NodeType.RestElement:
+ return gatherIdentifiers(node.argument);
</ins><span class="cx"> default:
</span><span class="cx"> console.assert(false, "Unexpected node type in variable declarator: " + node.type);
</span><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.Identifier || node.type === WebInspector.ScriptSyntaxTree.NodeType.ObjectPattern || node.type === WebInspector.ScriptSyntaxTree.NodeType.ArrayPattern);
</del><ins>+ console.assert(node.type === WebInspector.ScriptSyntaxTree.NodeType.Identifier || node.type === WebInspector.ScriptSyntaxTree.NodeType.ObjectPattern || node.type === WebInspector.ScriptSyntaxTree.NodeType.ArrayPattern || node.type === WebInspector.ScriptSyntaxTree.NodeType.RestElement);
</ins><span class="cx">
</span><span class="cx"> return gatherIdentifiers(node);
</span><span class="cx"> }
</span><span class="lines">@@ -288,71 +290,59 @@
</span><span class="cx"> if (state.shouldStopEarly || state.skipChildNodes)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ callback(node, state);
+
</ins><span class="cx"> switch (node.type) {
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.AssignmentExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.left, callback, state);
</span><span class="cx"> this._recurse(node.right, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ArrayExpression:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ArrayPattern:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.elements, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.AssignmentPattern:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.left, callback, state);
</span><span class="cx"> this._recurse(node.right, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.BlockStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.BinaryExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.left, callback, state);
</span><span class="cx"> this._recurse(node.right, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.BreakStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.label, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.CatchClause:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.param, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.CallExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.callee, callback, state);
</span><span class="cx"> this._recurseArray(node.arguments, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ClassBody:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ClassDeclaration:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ClassExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.id, callback, state);
</span><span class="cx"> this._recurse(node.superClass, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ContinueStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.label, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.DoWhileStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ExpressionStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.expression, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ForStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.init, callback, state);
</span><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> this._recurse(node.update, callback, state);
</span><span class="lines">@@ -360,7 +350,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ForInStatement:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ForOfStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.left, callback, state);
</span><span class="cx"> this._recurse(node.right, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="lines">@@ -368,134 +357,110 @@
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.FunctionDeclaration:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.FunctionExpression:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ArrowFunctionExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.id, callback, state);
</span><span class="cx"> this._recurseArray(node.params, callback, state);
</span><span class="cx"> this._recurseArray(node.defaults, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.IfStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> this._recurse(node.consequent, callback, state);
</span><span class="cx"> this._recurse(node.alternate, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.LabeledStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.label, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.LogicalExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.left, callback, state);
</span><span class="cx"> this._recurse(node.right, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.MemberExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.object, callback, state);
</span><span class="cx"> this._recurse(node.property, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.MethodDefinition:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.key, callback, state);
</span><span class="cx"> this._recurse(node.value, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.NewExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.callee, callback, state);
</span><span class="cx"> this._recurseArray(node.arguments, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ObjectExpression:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ObjectPattern:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.properties, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.Program:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.Property:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.key, callback, state);
</span><span class="cx"> this._recurse(node.value, callback, state);
</span><span class="cx"> break;
</span><ins>+ case WebInspector.ScriptSyntaxTree.NodeType.RestElement:
+ this._recurse(node.argument, callback, state);
+ break;
</ins><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ReturnStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.SequenceExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.expressions, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.SpreadElement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.SwitchStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.discriminant, callback, state);
</span><span class="cx"> this._recurseArray(node.cases, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.SwitchCase:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> this._recurseArray(node.consequent, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ConditionalExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> this._recurse(node.consequent, callback, state);
</span><span class="cx"> this._recurse(node.alternate, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.TaggedTemplateExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.tag, callback, state);
</span><span class="cx"> this._recurse(node.quasi, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.TemplateLiteral:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.quasis, callback, state);
</span><span class="cx"> this._recurseArray(node.expressions, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ThrowStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.TryStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.block, callback, state);
</span><span class="cx"> this._recurse(node.handler, callback, state);
</span><span class="cx"> this._recurse(node.finalizer, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.UnaryExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.UpdateExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.VariableDeclaration:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurseArray(node.declarations, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.VariableDeclarator:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.id, callback, state);
</span><span class="cx"> this._recurse(node.init, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.WhileStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.test, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.WithStatement:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.object, callback, state);
</span><span class="cx"> this._recurse(node.body, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.YieldExpression:
</span><del>- callback(node, state);
</del><span class="cx"> this._recurse(node.argument, callback, state);
</span><span class="cx"> break;
</span><span class="cx"> // All the leaf nodes go here.
</span><span class="lines">@@ -507,7 +472,6 @@
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.Super:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.ThisExpression:
</span><span class="cx"> case WebInspector.ScriptSyntaxTree.NodeType.TemplateElement:
</span><del>- callback(node, state);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -811,6 +775,12 @@
</span><span class="cx"> if (result.kind === "get" || result.kind === "set" || result.method)
</span><span class="cx"> result.value.typeProfilingReturnDivot = node.range[0]; // "g" in "get" or "s" in "set" or "[" in "['computed']" method or "m" in "methodName".
</span><span class="cx"> break;
</span><ins>+ case "RestElement":
+ result = {
+ type: WebInspector.ScriptSyntaxTree.NodeType.RestElement,
+ argument: this._createInternalSyntaxTree(node.argument)
+ };
+ break;
</ins><span class="cx"> case "ReturnStatement":
</span><span class="cx"> result = {
</span><span class="cx"> type: WebInspector.ScriptSyntaxTree.NodeType.ReturnStatement,
</span><span class="lines">@@ -995,6 +965,7 @@
</span><span class="cx"> ObjectPattern: Symbol("object-pattern"),
</span><span class="cx"> Program: Symbol("program"),
</span><span class="cx"> Property: Symbol("property"),
</span><ins>+ RestElement: Symbol("rest-element"),
</ins><span class="cx"> ReturnStatement: Symbol("return-statement"),
</span><span class="cx"> SequenceExpression: Symbol("sequence-expression"),
</span><span class="cx"> SpreadElement: Symbol("spread-element"),
</span></span></pre>
</div>
</div>
</body>
</html>