Rename traverseEs6 to traverse (and similarly with other methods with…

… "Es6" in the name. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=192698297
google · Apr 14, 2018 · 4c97e69 · 4c97e69
1 parent 8ae754b
commit 4c97e69
Show file tree

Hide file tree

Showing 173 changed files with 350 additions and 345 deletions.
diff --git a/src/com/google/javascript/jscomp/AliasStrings.java b/src/com/google/javascript/jscomp/AliasStrings.java
@@ -116,7 +116,7 @@ public void process(Node externs, Node root) {
     logger.fine("Aliasing common strings");
 
     // Traverse the tree and collect strings
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
 
     // 1st edit pass: replace some strings with aliases
     replaceStringsWithAliases();

diff --git a/src/com/google/javascript/jscomp/AmbiguateProperties.java b/src/com/google/javascript/jscomp/AmbiguateProperties.java
@@ -176,7 +176,7 @@ private int getIntForType(TypeI type) {
   public void process(Node externs, Node root) {
     // Find all property references and record the types on which they occur.
     // Populate stringNodesToRename, propertyMap, quotedNames.
-    NodeTraversal.traverseEs6(compiler, root, new ProcessProperties());
+    NodeTraversal.traverse(compiler, root, new ProcessProperties());
 
     ImmutableSet.Builder<String> reservedNames = ImmutableSet.<String>builder()
         .addAll(externedNames)

diff --git a/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java b/src/com/google/javascript/jscomp/AnalyzePrototypeProperties.java
@@ -151,11 +151,11 @@ class AnalyzePrototypeProperties implements CompilerPass {
   public void process(Node externRoot, Node root) {
     checkState(compiler.getLifeCycleStage().isNormalized());
     if (!canModifyExterns) {
-      NodeTraversal.traverseEs6(compiler, externRoot,
+      NodeTraversal.traverse(compiler, externRoot,
           new ProcessExternProperties());
     }
 
-    NodeTraversal.traverseEs6(compiler, root, new ProcessProperties());
+    NodeTraversal.traverse(compiler, root, new ProcessProperties());
 
     FixedPointGraphTraversal<NameInfo, JSModule> t =
         FixedPointGraphTraversal.newTraversal(new PropagateReferences());

diff --git a/src/com/google/javascript/jscomp/AngularPass.java b/src/com/google/javascript/jscomp/AngularPass.java
@@ -115,7 +115,7 @@ public void process(Node externs, Node root) {
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
     // Traverses AST looking for nodes annotated with @ngInject.
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
     // iterates through annotated nodes adding $inject property to elements.
     for (NodeContext entry : injectables) {
       String name = entry.getName();

diff --git a/src/com/google/javascript/jscomp/CheckAccessControls.java b/src/com/google/javascript/jscomp/CheckAccessControls.java
@@ -157,8 +157,8 @@ public void process(Node externs, Node root) {
     collectPass.process(externs, root);
     defaultVisibilityForFiles = collectPass.getFileOverviewVisibilityMap();
 
-    NodeTraversal.traverseEs6(compiler, externs, this);
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, externs, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
@@ -168,7 +168,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) {
     collectPass.hotSwapScript(scriptRoot, originalRoot);
     defaultVisibilityForFiles = collectPass.getFileOverviewVisibilityMap();
 
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CheckConformance.java b/src/com/google/javascript/jscomp/CheckConformance.java
@@ -79,7 +79,7 @@ public static interface Rule {
   @Override
   public void process(Node externs, Node root) {
     if (!rules.isEmpty()) {
-      NodeTraversal.traverseRootsEs6(compiler, this, externs, root);
+      NodeTraversal.traverseRoots(compiler, this, externs, root);
     }
   }
 

diff --git a/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java b/src/com/google/javascript/jscomp/CheckConstPrivateProperties.java
@@ -47,12 +47,12 @@ class CheckConstPrivateProperties extends NodeTraversal.AbstractPostOrderCallbac
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   /** Reports the property definitions that should use the @const annotation. */

diff --git a/src/com/google/javascript/jscomp/CheckDebuggerStatement.java b/src/com/google/javascript/jscomp/CheckDebuggerStatement.java
@@ -42,7 +42,7 @@ public CheckDebuggerStatement(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CheckJSDoc.java b/src/com/google/javascript/jscomp/CheckJSDoc.java
@@ -87,13 +87,13 @@ final class CheckJSDoc extends AbstractPostOrderCallback implements HotSwapCompi
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, externs, this);
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, externs, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java b/src/com/google/javascript/jscomp/CheckMissingAndExtraRequires.java
@@ -116,7 +116,7 @@ static enum Mode {
   @Override
   public void process(Node externs, Node root) {
     reset();
-    NodeTraversal.traverseRootsEs6(compiler, this, externs, root);
+    NodeTraversal.traverseRoots(compiler, this, externs, root);
   }
 
   @Override
@@ -125,7 +125,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) {
     // b/28869281 for context.
     mode = Mode.SINGLE_FILE;
     reset();
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   // Return true if the name is a class name (starts with an uppercase

diff --git a/src/com/google/javascript/jscomp/CheckMissingGetCssName.java b/src/com/google/javascript/jscomp/CheckMissingGetCssName.java
@@ -53,7 +53,7 @@ class CheckMissingGetCssName
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CheckProvides.java b/src/com/google/javascript/jscomp/CheckProvides.java
@@ -49,7 +49,7 @@ public void process(Node externs, Node root) {
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
     CheckProvidesCallback callback =
         new CheckProvidesCallback(codingConvention);
-    NodeTraversal.traverseEs6(compiler, scriptRoot, callback);
+    NodeTraversal.traverse(compiler, scriptRoot, callback);
   }
 
   private class CheckProvidesCallback extends AbstractShallowCallback {

diff --git a/src/com/google/javascript/jscomp/CheckRegExp.java b/src/com/google/javascript/jscomp/CheckRegExp.java
@@ -78,7 +78,7 @@ public CheckRegExp(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CheckSideEffects.java b/src/com/google/javascript/jscomp/CheckSideEffects.java
@@ -65,9 +65,9 @@ final class CheckSideEffects extends AbstractPostOrderCallback
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, externs, new GetNoSideEffectExterns());
+    NodeTraversal.traverse(compiler, externs, new GetNoSideEffectExterns());
 
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
 
     // Code with hidden side-effect code is common, for example
     // accessing "el.offsetWidth" forces a reflow in browsers, to allow this
@@ -82,7 +82,7 @@ public void process(Node externs, Node root) {
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override
@@ -210,7 +210,7 @@ static class StripProtection extends AbstractPostOrderCallback implements Compil
 
     @Override
     public void process(Node externs, Node root) {
-      NodeTraversal.traverseEs6(compiler, root, this);
+      NodeTraversal.traverse(compiler, root, this);
     }
 
     @Override

diff --git a/src/com/google/javascript/jscomp/CheckSuper.java b/src/com/google/javascript/jscomp/CheckSuper.java
@@ -44,12 +44,12 @@ public CheckSuper(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override
@@ -83,7 +83,7 @@ private boolean visitClass(NodeTraversal t, Node n) {
     }
 
     FindSuper finder = new FindSuper();
-    NodeTraversal.traverseEs6(compiler, NodeUtil.getFunctionBody(constructor), finder);
+    NodeTraversal.traverse(compiler, NodeUtil.getFunctionBody(constructor), finder);
 
     if (!finder.found) {
       t.report(constructor, MISSING_CALL_TO_SUPER);

diff --git a/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java b/src/com/google/javascript/jscomp/CheckUnusedPrivateProperties.java
@@ -55,12 +55,12 @@ class CheckUnusedPrivateProperties
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   private void reportUnused(NodeTraversal t) {

diff --git a/src/com/google/javascript/jscomp/ChromePass.java b/src/com/google/javascript/jscomp/ChromePass.java
@@ -113,7 +113,7 @@ public ChromePass(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
@@ -352,7 +352,7 @@ private void visitNamespaceDefinition(Node crDefineCallNode, Node parent) {
 
     Map<String, String> exports = objectLitToMap(objectLit);
 
-    NodeTraversal.traverseEs6(
+    NodeTraversal.traverse(
         compiler,
         functionBlock,
         new RenameInternalsToExternalsCallback(namespace, exports, functionBlock));

diff --git a/src/com/google/javascript/jscomp/ClosureCheckModule.java b/src/com/google/javascript/jscomp/ClosureCheckModule.java
@@ -186,12 +186,12 @@ public ClosureCheckModule(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java b/src/com/google/javascript/jscomp/ClosureOptimizePrimitives.java
@@ -87,7 +87,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
   @Override
   public void process(Node externs, Node root) {
     FindPrimitives pass = new FindPrimitives();
-    NodeTraversal.traverseEs6(compiler, root, pass);
+    NodeTraversal.traverse(compiler, root, pass);
   }
 
   /**

diff --git a/src/com/google/javascript/jscomp/ClosureRewriteClass.java b/src/com/google/javascript/jscomp/ClosureRewriteClass.java
@@ -103,7 +103,7 @@ public void process(Node externs, Node root) {
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
-    NodeTraversal.traverseEs6(compiler, scriptRoot, this);
+    NodeTraversal.traverse(compiler, scriptRoot, this);
   }
 
   @Override
@@ -498,7 +498,7 @@ private void rewriteGoogDefineClass(NodeTraversal t, Node exprRoot, final ClassD
       Node argList = cls.classModifier.getSecondChild();
       Node arg = argList.getFirstChild();
       final String argName = arg.getString();
-      NodeTraversal.traverseEs6(
+      NodeTraversal.traverse(
           compiler,
           cls.classModifier.getLastChild(),
           new AbstractPostOrderCallback() {

diff --git a/src/com/google/javascript/jscomp/ClosureRewriteModule.java b/src/com/google/javascript/jscomp/ClosureRewriteModule.java
@@ -701,7 +701,7 @@ private void processAllFiles(Deque<ScriptDescription> scriptDescriptions, Node s
     if (scriptParent == null) {
       return;
     }
-    NodeTraversal.traverseEs6(compiler, scriptParent, new UnwrapGoogLoadModule());
+    NodeTraversal.traverse(compiler, scriptParent, new UnwrapGoogLoadModule());
 
     // Record all the scripts first so that the googModuleNamespaces global state can be complete
     // before doing any updating also queue up scriptDescriptions for later use in ScriptUpdater
@@ -711,8 +711,8 @@ private void processAllFiles(Deque<ScriptDescription> scriptDescriptions, Node s
       pushScript(new ScriptDescription());
       currentScript.rootNode = c;
       scriptDescriptions.addLast(currentScript);
-      NodeTraversal.traverseEs6(compiler, c, new ScriptPreprocessor());
-      NodeTraversal.traverseEs6(compiler, c, new ScriptRecorder());
+      NodeTraversal.traverse(compiler, c, new ScriptPreprocessor());
+      NodeTraversal.traverse(compiler, c, new ScriptRecorder());
       popScript();
     }
 
@@ -725,28 +725,28 @@ private void processAllFiles(Deque<ScriptDescription> scriptDescriptions, Node s
     // scriptDescriptions that were queued up by all the recording.
     for (Node c = scriptParent.getFirstChild(); c != null; c = c.getNext()) {
       pushScript(scriptDescriptions.removeFirst());
-      NodeTraversal.traverseEs6(compiler, c, new ScriptUpdater());
+      NodeTraversal.traverse(compiler, c, new ScriptUpdater());
       popScript();
     }
   }
 
   @Override
   public void hotSwapScript(Node scriptRoot, Node originalRoot) {
     checkState(scriptRoot.isScript(), scriptRoot);
-    NodeTraversal.traverseEs6(compiler, scriptRoot, new UnwrapGoogLoadModule());
+    NodeTraversal.traverse(compiler, scriptRoot, new UnwrapGoogLoadModule());
 
     rewriteState.removeRoot(originalRoot);
 
     pushScript(new ScriptDescription());
     currentScript.rootNode = scriptRoot;
-    NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptPreprocessor());
-    NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptRecorder());
+    NodeTraversal.traverse(compiler, scriptRoot, new ScriptPreprocessor());
+    NodeTraversal.traverse(compiler, scriptRoot, new ScriptRecorder());
 
     if (compiler.hasHaltingErrors()) {
       return;
     }
 
-    NodeTraversal.traverseEs6(compiler, scriptRoot, new ScriptUpdater());
+    NodeTraversal.traverse(compiler, scriptRoot, new ScriptUpdater());
     popScript();
 
     reportUnrecognizedRequires();

diff --git a/src/com/google/javascript/jscomp/CoalesceVariableNames.java b/src/com/google/javascript/jscomp/CoalesceVariableNames.java
@@ -99,7 +99,7 @@ public int compare(Var v1, Var v2) {
   public void process(Node externs, Node root) {
     checkNotNull(externs);
     checkNotNull(root);
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
     compiler.setLifeCycleStage(LifeCycleStage.RAW);
   }
 

diff --git a/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java b/src/com/google/javascript/jscomp/CollapseAnonymousFunctions.java
@@ -48,7 +48,7 @@ public CollapseAnonymousFunctions(AbstractCompiler compiler) {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   @Override

diff --git a/src/com/google/javascript/jscomp/CollapseProperties.java b/src/com/google/javascript/jscomp/CollapseProperties.java
@@ -638,7 +638,7 @@ private void checkForHosedThisReferences(Node function, JSDocInfo docInfo,
         (docInfo != null && (docInfo.isConstructorOrInterface() || docInfo.hasThisType()))
         || function.isArrowFunction();
     if (!isAllowedToReferenceThis) {
-      NodeTraversal.traverseEs6(compiler, function.getLastChild(),
+      NodeTraversal.traverse(compiler, function.getLastChild(),
           new NodeTraversal.AbstractShallowCallback() {
             @Override
             public void visit(NodeTraversal t, Node n, Node parent) {

diff --git a/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java b/src/com/google/javascript/jscomp/CollapseVariableDeclarations.java
@@ -103,7 +103,7 @@ public void process(Node externs, Node root) {
     collapses.clear();
     nodesToCollapse.clear();
 
-    NodeTraversal.traverseEs6(compiler, root, new GatherCollapses());
+    NodeTraversal.traverse(compiler, root, new GatherCollapses());
 
     if (!collapses.isEmpty()) {
       applyCollapses();

diff --git a/src/com/google/javascript/jscomp/CollectFunctionNames.java b/src/com/google/javascript/jscomp/CollectFunctionNames.java
@@ -132,7 +132,7 @@ private static class FunctionRecord implements Serializable {
 
   @Override
   public void process(Node externs, Node root) {
-    NodeTraversal.traverseEs6(compiler, root, this);
+    NodeTraversal.traverse(compiler, root, this);
   }
 
   public FunctionNames getFunctionNames() {