DevTools: [PrettyPrint] support template literals in pretty-printing

Source/devtools/front_end/script_formatter_worker/ESTreeWalker.js

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @param {function(!ESTree.Node)} beforeVisit
  * @param {function(!ESTree.Node)} afterVisit
  */
 FormatterWorker.ESTreeWalker = function(beforeVisit, afterVisit)
@@ skipping 22 matching lines @@
         node.parent = parent;
 
         this._beforeVisit.call(null, node);
 
         var walkOrder = FormatterWorker.ESTreeWalker._walkOrder[node.type];
         if (!walkOrder) {
             console.error("Walk order not defined for " + node.type);
             return;
         }
 
-        for (var i = 0; i < walkOrder.length; ++i) {
-            var entity = node[walkOrder[i]];
-            if (Array.isArray(entity))
-                this._walkArray(entity, node);
-            else
-                this._innerWalk(entity, node);
+        if (node.type === "TemplateLiteral") {
+            var templateLiteral = /** @type {!ESTree.TemplateLiteralNode} */ (node);
+            var expressionsLength = templateLiteral.expressions.length;
+            for (var i = 0; i < expressionsLength; ++i) {
+                this._innerWalk(templateLiteral.quasis[i], templateLiteral);
+                this._innerWalk(templateLiteral.expressions[i], templateLiteral);
+            }
+            this._innerWalk(templateLiteral.quasis[expressionsLength - 1], templateLiteral);

[sergeyv, 2015/05/14 13:01:17]

expressionLength

[lushnikov, 2015/05/14 13:07:54]

Nice catch, thanks!

+        } else {
+            for (var i = 0; i < walkOrder.length; ++i) {
+                var entity = node[walkOrder[i]];
+                if (Array.isArray(entity))
+                    this._walkArray(entity, node);
+                else
+                    this._innerWalk(entity, node);
+            }
         }
 
         this._afterVisit.call(null, node);
     },
 
     /**
      * @param {!Array.<!ESTree.Node>} nodeArray
      * @param {?ESTree.Node} parentNode
      */
     _walkArray: function(nodeArray, parentNode)
@@ skipping 34 matching lines @@
     "MethodDefinition": ["key", "value"],
     "NewExpression": ["callee", "arguments"],
     "ObjectExpression": ["properties"],
     "Program": ["body"],
     "Property": ["key", "value"],
     "ReturnStatement": ["argument"],
     "SequenceExpression": ["expressions"],
     "Super": [],
     "SwitchCase": ["test", "consequent"],
     "SwitchStatement": ["discriminant", "cases"],
+    "TaggedTemplateExpression": ["tag", "quasi"],
+    "TemplateElement": [],
+    "TemplateLiteral": ["quasis", "expressions"],
     "ThisExpression": [],
     "ThrowStatement": ["argument"],
     "TryStatement": ["block", "handler", "finalizer"],
     "UnaryExpression": ["argument"],
     "UpdateExpression": ["argument"],
     "VariableDeclaration": ["declarations"],
     "VariableDeclarator": ["id", "init"],
     "WhileStatement": ["test", "body"],
     "WithStatement": ["object", "body"],
     "YieldExpression": ["argument"]
 }