From 224ba4b1fa786943a4f69ba7dce9c5903b6a4b2a Mon Sep 17 00:00:00 2001 From: johnlenz Date: Fri, 12 Jul 2019 11:17:44 -0700 Subject: [PATCH] Finish the migration to the Es6SyntacticScopeCreator by renaming the class SyntacticScopeCreator. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=257835869 --- .../jscomp/AggressiveInlineAliases.java | 2 +- .../jscomp/CoalesceVariableNames.java | 3 +-- .../google/javascript/jscomp/Compiler.java | 4 +--- .../jscomp/CrossChunkCodeMotion.java | 2 +- .../javascript/jscomp/DataFlowAnalysis.java | 7 +++--- .../jscomp/DeadAssignmentsElimination.java | 2 +- .../google/javascript/jscomp/Denormalize.java | 2 +- .../Es6RenameVariablesInParamLists.java | 4 ++-- .../jscomp/FlowSensitiveInlineVariables.java | 4 ++-- .../jscomp/IncrementalScopeCreator.java | 24 +++++++++---------- .../google/javascript/jscomp/InferConsts.java | 5 ++-- .../jscomp/InlineObjectLiterals.java | 5 ++-- .../javascript/jscomp/InlineVariables.java | 2 +- .../jscomp/LiveVariablesAnalysis.java | 2 +- .../jscomp/MaybeReachingVariableUse.java | 2 +- .../jscomp/MustBeReachingVariableDef.java | 2 +- .../javascript/jscomp/NodeTraversal.java | 8 +++---- .../google/javascript/jscomp/NodeUtil.java | 2 +- .../google/javascript/jscomp/Normalize.java | 10 ++++---- .../javascript/jscomp/RemoveUnusedCode.java | 4 ++-- .../jscomp/RewriteGoogJsImports.java | 2 +- .../javascript/jscomp/ScopeCreator.java | 2 +- ...reator.java => SyntacticScopeCreator.java} | 23 +++++++++--------- .../javascript/jscomp/TypedScopeCreator.java | 2 +- .../google/javascript/jscomp/VarCheck.java | 10 ++++---- .../jscomp/VariableReferenceCheck.java | 4 ++-- .../javascript/jscomp/AstFactoryTest.java | 7 +++--- .../CrossChunkReferenceCollectorTest.java | 2 +- .../jscomp/DataFlowAnalysisTest.java | 2 +- .../jscomp/GlobalNamespaceTest.java | 2 +- .../jscomp/LiveVariablesAnalysisTest.java | 4 ++-- .../jscomp/MaybeReachingVariableUseTest.java | 2 +- .../jscomp/MemoizedScopeCreatorTest.java | 4 ++-- .../jscomp/MustBeReachingVariableDefTest.java | 2 +- .../javascript/jscomp/NodeTraversalTest.java | 14 +++++------ .../javascript/jscomp/NodeUtilTest.java | 8 +++---- .../ReferenceCollectingCallbackTest.java | 10 ++++---- ...st.java => SyntacticScopeCreatorTest.java} | 10 ++++---- 38 files changed, 98 insertions(+), 108 deletions(-) rename src/com/google/javascript/jscomp/{Es6SyntacticScopeCreator.java => SyntacticScopeCreator.java} (94%) rename test/com/google/javascript/jscomp/{Es6SyntacticScopeCreatorTest.java => SyntacticScopeCreatorTest.java} (99%) diff --git a/src/com/google/javascript/jscomp/AggressiveInlineAliases.java b/src/com/google/javascript/jscomp/AggressiveInlineAliases.java index 6dd7fa57422..22edf090c98 100644 --- a/src/com/google/javascript/jscomp/AggressiveInlineAliases.java +++ b/src/com/google/javascript/jscomp/AggressiveInlineAliases.java @@ -325,7 +325,7 @@ private void inlineAliasIfPossible(Name name, Ref alias, GlobalNamespace namespa new ReferenceCollectingCallback( compiler, ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR, - new Es6SyntacticScopeCreator(compiler), + new SyntacticScopeCreator(compiler), Predicates.equalTo(aliasVar)); Scope aliasScope = aliasVar.getScope(); collector.processScope(aliasScope); diff --git a/src/com/google/javascript/jscomp/CoalesceVariableNames.java b/src/com/google/javascript/jscomp/CoalesceVariableNames.java index de1125d3911..a49bfd7e2e4 100644 --- a/src/com/google/javascript/jscomp/CoalesceVariableNames.java +++ b/src/com/google/javascript/jscomp/CoalesceVariableNames.java @@ -135,8 +135,7 @@ public void enterScope(NodeTraversal t) { ControlFlowGraph cfg = t.getControlFlowGraph(); liveness = - new LiveVariablesAnalysis( - cfg, scope, null, compiler, new Es6SyntacticScopeCreator(compiler)); + new LiveVariablesAnalysis(cfg, scope, null, compiler, new SyntacticScopeCreator(compiler)); if (FeatureSet.ES3.contains(compiler.getOptions().getOutputFeatureSet())) { // If the function has exactly 2 params, mark them as escaped. This is a work-around for a diff --git a/src/com/google/javascript/jscomp/Compiler.java b/src/com/google/javascript/jscomp/Compiler.java index 5545d255685..e51be040ef3 100644 --- a/src/com/google/javascript/jscomp/Compiler.java +++ b/src/com/google/javascript/jscomp/Compiler.java @@ -1491,9 +1491,7 @@ public SymbolTable buildKnownSymbolTable() { ReferenceCollectingCallback refCollector = new ReferenceCollectingCallback( - this, - ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR, - new Es6SyntacticScopeCreator(this)); + this, ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR, new SyntacticScopeCreator(this)); refCollector.process(getRoot()); symbolTable.addSymbolsFrom(refCollector); diff --git a/src/com/google/javascript/jscomp/CrossChunkCodeMotion.java b/src/com/google/javascript/jscomp/CrossChunkCodeMotion.java index 4c09d3f87f8..4122cb108ac 100644 --- a/src/com/google/javascript/jscomp/CrossChunkCodeMotion.java +++ b/src/com/google/javascript/jscomp/CrossChunkCodeMotion.java @@ -95,7 +95,7 @@ public void process(Node externs, Node root) { // If there are <2 chunks, then we will never move anything, so we're done if (graph.getModuleCount() > 1) { CrossChunkReferenceCollector referenceCollector = - new CrossChunkReferenceCollector(compiler, new Es6SyntacticScopeCreator(compiler)); + new CrossChunkReferenceCollector(compiler, new SyntacticScopeCreator(compiler)); referenceCollector.process(root); Collection globalSymbols = new GlobalSymbolCollector().collectGlobalSymbols(referenceCollector); diff --git a/src/com/google/javascript/jscomp/DataFlowAnalysis.java b/src/com/google/javascript/jscomp/DataFlowAnalysis.java index 744ce8d29fb..2b4a8827cf7 100644 --- a/src/com/google/javascript/jscomp/DataFlowAnalysis.java +++ b/src/com/google/javascript/jscomp/DataFlowAnalysis.java @@ -526,9 +526,8 @@ public int hashCode() { * referenced outside of the code that we are analyzing. A variable is escaped if any of the * following is true: * - * 1. Exported variables as they can be needed after the script terminates. - * 2. Names of named functions because in JavaScript, function foo(){} does not kill - * foo in the dataflow. + *

1. Exported variables as they can be needed after the script terminates. 2. Names of named + * functions because in JavaScript, function foo(){} does not kill foo in the dataflow. * * @param jsScope Must be a function scope */ @@ -536,7 +535,7 @@ static void computeEscaped( final Scope jsScope, final Set escaped, AbstractCompiler compiler, - Es6SyntacticScopeCreator scopeCreator) { + SyntacticScopeCreator scopeCreator) { checkArgument(jsScope.isFunctionScope()); diff --git a/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java b/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java index 84e8c594cbf..2392bfe75bf 100644 --- a/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java +++ b/src/com/google/javascript/jscomp/DeadAssignmentsElimination.java @@ -123,7 +123,7 @@ private void eliminateDeadAssignments(NodeTraversal t) { ControlFlowGraph cfg = t.getControlFlowGraph(); liveness = new LiveVariablesAnalysis( - cfg, functionScope, blockScope, compiler, new Es6SyntacticScopeCreator(compiler)); + cfg, functionScope, blockScope, compiler, new SyntacticScopeCreator(compiler)); liveness.analyze(); Map allVarsInFn = liveness.getAllVariables(); tryRemoveDeadAssignments(t, cfg, allVarsInFn); diff --git a/src/com/google/javascript/jscomp/Denormalize.java b/src/com/google/javascript/jscomp/Denormalize.java index 41de5f32d81..e7be5d11807 100644 --- a/src/com/google/javascript/jscomp/Denormalize.java +++ b/src/com/google/javascript/jscomp/Denormalize.java @@ -57,7 +57,7 @@ public void process(Node externs, Node root) { NodeTraversal.traverse(compiler, root, this); // Don't inline the VAR declaration if this compilation involves old-style ctemplates. if (compiler.getOptions().syntheticBlockStartMarker == null) { - (new ReferenceCollectingCallback(compiler, this, new Es6SyntacticScopeCreator(compiler))) + (new ReferenceCollectingCallback(compiler, this, new SyntacticScopeCreator(compiler))) .process(root); } } diff --git a/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java b/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java index 3113c059324..948ea3da301 100644 --- a/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java +++ b/src/com/google/javascript/jscomp/Es6RenameVariablesInParamLists.java @@ -68,7 +68,7 @@ public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { }); Node block = paramList.getNext(); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); Scope fScope = creator.createScope(n, t.getScope()); Scope fBlockScope = creator.createScope(block, fScope); Table renameTable = HashBasedTable.create(); @@ -81,7 +81,7 @@ public final boolean shouldTraverse(NodeTraversal t, Node n, Node parent) { } } new NodeTraversal( - compiler, new Es6RenameReferences(renameTable), new Es6SyntacticScopeCreator(compiler)) + compiler, new Es6RenameReferences(renameTable), new SyntacticScopeCreator(compiler)) .traverseInnerNode(block, block.getParent(), fScope); } diff --git a/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java b/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java index a8ee07c3e86..1d9a4430aeb 100644 --- a/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java +++ b/src/com/google/javascript/jscomp/FlowSensitiveInlineVariables.java @@ -175,7 +175,7 @@ public void enterScope(NodeTraversal t) { return; } - Es6SyntacticScopeCreator scopeCreator = (Es6SyntacticScopeCreator) t.getScopeCreator(); + SyntacticScopeCreator scopeCreator = (SyntacticScopeCreator) t.getScopeCreator(); // Compute the forward reaching definition. ControlFlowAnalysis cfa = new ControlFlowAnalysis(compiler, false, true); @@ -260,7 +260,7 @@ public void exitScope(NodeTraversal t) {} @Override public void process(Node externs, Node root) { - (new NodeTraversal(compiler, this, new Es6SyntacticScopeCreator(compiler))) + (new NodeTraversal(compiler, this, new SyntacticScopeCreator(compiler))) .traverseRoots(externs, root); } diff --git a/src/com/google/javascript/jscomp/IncrementalScopeCreator.java b/src/com/google/javascript/jscomp/IncrementalScopeCreator.java index 3ac4af57cda..a9b6134245c 100644 --- a/src/com/google/javascript/jscomp/IncrementalScopeCreator.java +++ b/src/com/google/javascript/jscomp/IncrementalScopeCreator.java @@ -23,7 +23,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Multimap; -import com.google.javascript.jscomp.Es6SyntacticScopeCreator.ScopeScanner; +import com.google.javascript.jscomp.SyntacticScopeCreator.ScopeScanner; import com.google.javascript.rhino.Node; import java.util.ArrayList; import java.util.Collection; @@ -34,15 +34,14 @@ import java.util.Set; /** - * A reusable scope creator which invalidates scopes based on reported - * AST changes to SCRIPT and FUNCTION codes (aka "change scopes"). This - * class stores an instance of itself on the compiler object which is accessible via - * the "getInstance" static method. To ensure that consumers see a consistent state, - * they must call "freeze"/"thaw" before and after use (typically for the duration + * A reusable scope creator which invalidates scopes based on reported AST changes to SCRIPT and + * FUNCTION codes (aka "change scopes"). This class stores an instance of itself on the compiler + * object which is accessible via the "getInstance" static method. To ensure that consumers see a + * consistent state, they must call "freeze"/"thaw" before and after use (typically for the duration * of a NodeTraveral). * - * This class delegates to the Es6SyntacticScopeCreator and requires a consistent - * definition of global Scope (the global scope root must include both externs and code). + *

This class delegates to the SyntacticScopeCreator and requires a consistent definition of + * global Scope (the global scope root must include both externs and code). */ class IncrementalScopeCreator implements ScopeCreator { @@ -50,7 +49,7 @@ class IncrementalScopeCreator implements ScopeCreator { // TODO(johnlenz): This leaks scope object for scopes removed from the AST. // Soon we will track removed function nodes use that to remove scopes. private final Map scopesByScopeRoot = new HashMap<>(); - private final Es6SyntacticScopeCreator delegate; + private final SyntacticScopeCreator delegate; private final PersistentScopeFactory factory = new PersistentScopeFactory(); @@ -388,13 +387,12 @@ void refresh(AbstractCompiler compiler, PersistentScope newParent) { } } - Es6SyntacticScopeCreator createInternalScopeCreator(AbstractCompiler compiler) { - return new Es6SyntacticScopeCreator(compiler, factory, factory); + SyntacticScopeCreator createInternalScopeCreator(AbstractCompiler compiler) { + return new SyntacticScopeCreator(compiler, factory, factory); } private static class PersistentScopeFactory - implements Es6SyntacticScopeCreator.ScopeFactory, - Es6SyntacticScopeCreator.RedeclarationHandler { + implements SyntacticScopeCreator.ScopeFactory, SyntacticScopeCreator.RedeclarationHandler { @Override public PersistentScope create(Scope parent, Node n) { return PersistentScope.create((PersistentScope) parent, n); diff --git a/src/com/google/javascript/jscomp/InferConsts.java b/src/com/google/javascript/jscomp/InferConsts.java index f786a12e0d7..d0937156c06 100644 --- a/src/com/google/javascript/jscomp/InferConsts.java +++ b/src/com/google/javascript/jscomp/InferConsts.java @@ -47,15 +47,14 @@ public void process(Node externs, Node js) { new ReferenceCollectingCallback( compiler, ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR, - new Es6SyntacticScopeCreator(compiler)); + new SyntacticScopeCreator(compiler)); collector.process(js); for (Var v : collector.getAllSymbols()) { considerVar(v, collector.getReferences(v)); } - Scope globalExternsScope = - new Es6SyntacticScopeCreator(compiler).createScope(externs, null); + Scope globalExternsScope = new SyntacticScopeCreator(compiler).createScope(externs, null); for (Var v : globalExternsScope.getAllSymbols()) { considerVar(v, null); } diff --git a/src/com/google/javascript/jscomp/InlineObjectLiterals.java b/src/com/google/javascript/jscomp/InlineObjectLiterals.java index bbe77b78fc2..e164abd8813 100644 --- a/src/com/google/javascript/jscomp/InlineObjectLiterals.java +++ b/src/com/google/javascript/jscomp/InlineObjectLiterals.java @@ -61,8 +61,9 @@ class InlineObjectLiterals implements CompilerPass { @Override public void process(Node externs, Node root) { - ReferenceCollectingCallback callback = new ReferenceCollectingCallback( - compiler, new InliningBehavior(), new Es6SyntacticScopeCreator(compiler)); + ReferenceCollectingCallback callback = + new ReferenceCollectingCallback( + compiler, new InliningBehavior(), new SyntacticScopeCreator(compiler)); callback.process(externs, root); } diff --git a/src/com/google/javascript/jscomp/InlineVariables.java b/src/com/google/javascript/jscomp/InlineVariables.java index 6b58952d731..e61cce4966b 100644 --- a/src/com/google/javascript/jscomp/InlineVariables.java +++ b/src/com/google/javascript/jscomp/InlineVariables.java @@ -86,7 +86,7 @@ public void process(Node externs, Node root) { new ReferenceCollectingCallback( compiler, new InliningBehavior(), - new Es6SyntacticScopeCreator(compiler), + new SyntacticScopeCreator(compiler), mode.varPredicate); callback.process(externs, root); } diff --git a/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java b/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java index dbfa5dd1b64..40ebdb0d063 100644 --- a/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java +++ b/src/com/google/javascript/jscomp/LiveVariablesAnalysis.java @@ -142,7 +142,7 @@ public int hashCode() { Scope jsScope, @Nullable Scope jsScopeChild, AbstractCompiler compiler, - Es6SyntacticScopeCreator scopeCreator) { + SyntacticScopeCreator scopeCreator) { super(cfg, new LiveVariableJoinOp()); checkState(jsScope.isFunctionScope(), jsScope); diff --git a/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java b/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java index 548baa69259..d4f5207e802 100644 --- a/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java +++ b/src/com/google/javascript/jscomp/MaybeReachingVariableUse.java @@ -56,7 +56,7 @@ class MaybeReachingVariableUse extends ControlFlowGraph cfg, Scope jsScope, AbstractCompiler compiler, - Es6SyntacticScopeCreator scopeCreator) { + SyntacticScopeCreator scopeCreator) { super(cfg, new ReachingUsesJoinOp()); this.escaped = new HashSet<>(); this.allVarsInFn = new HashMap<>(); diff --git a/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java b/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java index 3ce07945588..573061da0cd 100644 --- a/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java +++ b/src/com/google/javascript/jscomp/MustBeReachingVariableDef.java @@ -55,7 +55,7 @@ final class MustBeReachingVariableDef extends ControlFlowGraph cfg, Scope jsScope, AbstractCompiler compiler, - Es6SyntacticScopeCreator scopeCreator) { + SyntacticScopeCreator scopeCreator) { super(cfg, new MustDefJoin()); this.compiler = compiler; this.escaped = new HashSet<>(); diff --git a/src/com/google/javascript/jscomp/NodeTraversal.java b/src/com/google/javascript/jscomp/NodeTraversal.java index fe7f11c2187..fb598e9a94e 100644 --- a/src/com/google/javascript/jscomp/NodeTraversal.java +++ b/src/com/google/javascript/jscomp/NodeTraversal.java @@ -375,9 +375,9 @@ public void traverse(Node root) { } } - /** Traverses using the ES6SyntacticScopeCreator */ + /** Traverses using the SyntacticScopeCreator */ public static void traverse(AbstractCompiler compiler, Node root, Callback cb) { - NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); + NodeTraversal t = new NodeTraversal(compiler, cb, new SyntacticScopeCreator(compiler)); t.traverse(root); } @@ -408,7 +408,7 @@ void traverseRoots(Node externs, Node root) { public static void traverseRoots( AbstractCompiler compiler, Callback cb, Node externs, Node root) { - NodeTraversal t = new NodeTraversal(compiler, cb, new Es6SyntacticScopeCreator(compiler)); + NodeTraversal t = new NodeTraversal(compiler, cb, new SyntacticScopeCreator(compiler)); t.traverseRoots(externs, root); } @@ -592,7 +592,7 @@ public static void traverseScopeRoots( NodeTraversal.traverse(compiler, root, cb); } else { MemoizedScopeCreator scopeCreator = - new MemoizedScopeCreator(new Es6SyntacticScopeCreator(compiler)); + new MemoizedScopeCreator(new SyntacticScopeCreator(compiler)); for (final Node scopeNode : scopeNodes) { traverseSingleScopeRoot( diff --git a/src/com/google/javascript/jscomp/NodeUtil.java b/src/com/google/javascript/jscomp/NodeUtil.java index 6da7b3a415e..293909c0a0f 100644 --- a/src/com/google/javascript/jscomp/NodeUtil.java +++ b/src/com/google/javascript/jscomp/NodeUtil.java @@ -5462,7 +5462,7 @@ static ImmutableSet collectExternVariableNames(AbstractCompiler compiler new ReferenceCollectingCallback( compiler, ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR, - new Es6SyntacticScopeCreator(compiler)); + new SyntacticScopeCreator(compiler)); externsRefs.process(externs); ImmutableSet.Builder externsNames = ImmutableSet.builder(); for (Var v : externsRefs.getAllSymbols()) { diff --git a/src/com/google/javascript/jscomp/Normalize.java b/src/com/google/javascript/jscomp/Normalize.java index d2e953851af..347260f987b 100644 --- a/src/com/google/javascript/jscomp/Normalize.java +++ b/src/com/google/javascript/jscomp/Normalize.java @@ -782,16 +782,14 @@ private static Node addToFront(Node parent, Node newChild, Node after) { private void removeDuplicateDeclarations(Node externs, Node root) { Callback tickler = new ScopeTicklingCallback(); ScopeCreator scopeCreator = - new Es6SyntacticScopeCreator(compiler, new DuplicateDeclarationHandler()); + new SyntacticScopeCreator(compiler, new DuplicateDeclarationHandler()); NodeTraversal t = new NodeTraversal(compiler, tickler, scopeCreator); t.traverseRoots(externs, root); } - /** - * ScopeCreator duplicate declaration handler. - */ - private final class DuplicateDeclarationHandler implements - Es6SyntacticScopeCreator.RedeclarationHandler { + /** ScopeCreator duplicate declaration handler. */ + private final class DuplicateDeclarationHandler + implements SyntacticScopeCreator.RedeclarationHandler { private final Set hasOkDuplicateDeclaration = new HashSet<>(); diff --git a/src/com/google/javascript/jscomp/RemoveUnusedCode.java b/src/com/google/javascript/jscomp/RemoveUnusedCode.java index 35b277efae5..7f7d5c1da53 100644 --- a/src/com/google/javascript/jscomp/RemoveUnusedCode.java +++ b/src/com/google/javascript/jscomp/RemoveUnusedCode.java @@ -140,7 +140,7 @@ class RemoveUnusedCode implements CompilerPass { */ private final Multimap polyfills = HashMultimap.create(); - private final Es6SyntacticScopeCreator scopeCreator; + private final SyntacticScopeCreator scopeCreator; private final boolean removeUnusedPrototypeProperties; private final boolean allowRemovalOfExternProperties; @@ -163,7 +163,7 @@ class RemoveUnusedCode implements CompilerPass { this.removeUnusedObjectDefinePropertiesDefinitions = builder.removeUnusedObjectDefinePropertiesDefinitions; this.removeUnusedPolyfills = builder.removeUnusedPolyfills; - this.scopeCreator = new Es6SyntacticScopeCreator(builder.compiler); + this.scopeCreator = new SyntacticScopeCreator(builder.compiler); // All Vars that are completely unremovable will share this VarInfo instance. canonicalUnremovableVarInfo = new VarInfo(); diff --git a/src/com/google/javascript/jscomp/RewriteGoogJsImports.java b/src/com/google/javascript/jscomp/RewriteGoogJsImports.java index ab471628fc3..d43b616e5bd 100644 --- a/src/com/google/javascript/jscomp/RewriteGoogJsImports.java +++ b/src/com/google/javascript/jscomp/RewriteGoogJsImports.java @@ -284,7 +284,7 @@ private Node findGoogImportNode(Node scriptRoot) { } Scope moduleScope = - new Es6SyntacticScopeCreator(compiler) + new SyntacticScopeCreator(compiler) .createScope(scriptRoot.getFirstChild(), Scope.createGlobalScope(scriptRoot)); Var googVar = moduleScope.getVar("goog"); diff --git a/src/com/google/javascript/jscomp/ScopeCreator.java b/src/com/google/javascript/jscomp/ScopeCreator.java index 7d569a35176..fd74c2cff48 100644 --- a/src/com/google/javascript/jscomp/ScopeCreator.java +++ b/src/com/google/javascript/jscomp/ScopeCreator.java @@ -37,7 +37,7 @@ interface ScopeCreator { /** * A scope creator that can be provided to NodeTraversal to ensure that no scopes are actually - * ever created. This is in contrast to the default Es6SyntacticScopeCreator, which will create + * ever created. This is in contrast to the default SyntacticScopeCreator, which will create * scopes on demand. */ ScopeCreator ASSERT_NO_SCOPES_CREATED = diff --git a/src/com/google/javascript/jscomp/Es6SyntacticScopeCreator.java b/src/com/google/javascript/jscomp/SyntacticScopeCreator.java similarity index 94% rename from src/com/google/javascript/jscomp/Es6SyntacticScopeCreator.java rename to src/com/google/javascript/jscomp/SyntacticScopeCreator.java index 3b483029c9b..e60fd786818 100644 --- a/src/com/google/javascript/jscomp/Es6SyntacticScopeCreator.java +++ b/src/com/google/javascript/jscomp/SyntacticScopeCreator.java @@ -24,15 +24,15 @@ import javax.annotation.Nullable; /** - *

The syntactic scope creator scans the parse tree to create a Scope object - * containing all the variable declarations in that scope. This class adds support - * for block-level scopes introduced in ECMAScript 6.

+ * The syntactic scope creator scans the parse tree to create a Scope object containing all the + * variable declarations in that scope. This class adds support for block-level scopes introduced in + * ECMAScript 6. * - *

This implementation is not thread-safe.

+ *

This implementation is not thread-safe. * * @author moz@google.com (Michael Zhou) */ -public class Es6SyntacticScopeCreator implements ScopeCreator { +public class SyntacticScopeCreator implements ScopeCreator { private final AbstractCompiler compiler; private final RedeclarationHandler redeclarationHandler; private final ScopeFactory scopeFactory; @@ -44,22 +44,21 @@ public class Es6SyntacticScopeCreator implements ScopeCreator { public static final RedeclarationHandler DEFAULT_REDECLARATION_HANDLER = new DefaultRedeclarationHandler(); - - public Es6SyntacticScopeCreator(AbstractCompiler compiler) { + public SyntacticScopeCreator(AbstractCompiler compiler) { this(compiler, DEFAULT_REDECLARATION_HANDLER); } - public Es6SyntacticScopeCreator(AbstractCompiler compiler, ScopeFactory scopeFactory) { + public SyntacticScopeCreator(AbstractCompiler compiler, ScopeFactory scopeFactory) { this(compiler, DEFAULT_REDECLARATION_HANDLER, scopeFactory); } - Es6SyntacticScopeCreator( - AbstractCompiler compiler, RedeclarationHandler redeclarationHandler) { + SyntacticScopeCreator(AbstractCompiler compiler, RedeclarationHandler redeclarationHandler) { this(compiler, redeclarationHandler, new DefaultScopeFactory()); } - Es6SyntacticScopeCreator( - AbstractCompiler compiler, RedeclarationHandler redeclarationHandler, + SyntacticScopeCreator( + AbstractCompiler compiler, + RedeclarationHandler redeclarationHandler, ScopeFactory scopeFactory) { this.compiler = compiler; this.redeclarationHandler = redeclarationHandler; diff --git a/src/com/google/javascript/jscomp/TypedScopeCreator.java b/src/com/google/javascript/jscomp/TypedScopeCreator.java index 5f60ac220a5..c4f1be00764 100644 --- a/src/com/google/javascript/jscomp/TypedScopeCreator.java +++ b/src/com/google/javascript/jscomp/TypedScopeCreator.java @@ -661,7 +661,7 @@ TypedScope createInitialScope(Node root) { // Gather global information used in typed scope creation. Use a memoized scope creator because // scope-building takes a nontrivial amount of time. MemoizedScopeCreator scopeCreator = - new MemoizedScopeCreator(new Es6SyntacticScopeCreator(compiler)); + new MemoizedScopeCreator(new SyntacticScopeCreator(compiler)); new NodeTraversal(compiler, new FirstOrderFunctionAnalyzer(), scopeCreator) .traverseRoots(root.getFirstChild(), root.getLastChild()); diff --git a/src/com/google/javascript/jscomp/VarCheck.java b/src/com/google/javascript/jscomp/VarCheck.java index e393d34257c..3bbc0102160 100644 --- a/src/com/google/javascript/jscomp/VarCheck.java +++ b/src/com/google/javascript/jscomp/VarCheck.java @@ -19,10 +19,10 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableSet; -import com.google.javascript.jscomp.Es6SyntacticScopeCreator.RedeclarationHandler; import com.google.javascript.jscomp.NodeTraversal.AbstractPreOrderCallback; import com.google.javascript.jscomp.NodeTraversal.Callback; import com.google.javascript.jscomp.NodeTraversal.ScopedCallback; +import com.google.javascript.jscomp.SyntacticScopeCreator.RedeclarationHandler; import com.google.javascript.rhino.IR; import com.google.javascript.rhino.JSDocInfoBuilder; import com.google.javascript.rhino.Node; @@ -131,12 +131,12 @@ class VarCheck implements ScopedCallback, HotSwapCompilerPass { * Creates the scope creator used by this pass. If not in validity check mode, use a {@link * RedeclarationCheckHandler} to check var redeclarations. */ - private Es6SyntacticScopeCreator createScopeCreator() { + private SyntacticScopeCreator createScopeCreator() { if (validityCheck) { - return new Es6SyntacticScopeCreator(compiler); + return new SyntacticScopeCreator(compiler); } else { dupHandler = new RedeclarationCheckHandler(); - return new Es6SyntacticScopeCreator(compiler, dupHandler); + return new SyntacticScopeCreator(compiler, dupHandler); } } @@ -178,7 +178,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) { gatherImplicitVars(compiler.getRoot()); } - Es6SyntacticScopeCreator scopeCreator = createScopeCreator(); + SyntacticScopeCreator scopeCreator = createScopeCreator(); NodeTraversal t = new NodeTraversal(compiler, this, scopeCreator); // Note we use the global scope to prevent wrong "undefined-var errors" on // variables that are defined in other JS files. diff --git a/src/com/google/javascript/jscomp/VariableReferenceCheck.java b/src/com/google/javascript/jscomp/VariableReferenceCheck.java index 2613eb4a572..61a28a81386 100644 --- a/src/com/google/javascript/jscomp/VariableReferenceCheck.java +++ b/src/com/google/javascript/jscomp/VariableReferenceCheck.java @@ -113,7 +113,7 @@ private boolean shouldProcess(Node root) { public void process(Node externs, Node root) { if (shouldProcess(root)) { new ReferenceCollectingCallback( - compiler, new ReferenceCheckingBehavior(), new Es6SyntacticScopeCreator(compiler)) + compiler, new ReferenceCheckingBehavior(), new SyntacticScopeCreator(compiler)) .process(externs, root); } } @@ -124,7 +124,7 @@ public void hotSwapScript(Node scriptRoot, Node originalRoot) { || (compiler.getOptions().getLanguageIn().toFeatureSet().contains(FeatureSet.ES6) && TranspilationPasses.isScriptEs6OrHigher(scriptRoot))) { new ReferenceCollectingCallback( - compiler, new ReferenceCheckingBehavior(), new Es6SyntacticScopeCreator(compiler)) + compiler, new ReferenceCheckingBehavior(), new SyntacticScopeCreator(compiler)) .hotSwapScript(scriptRoot, originalRoot); } } diff --git a/test/com/google/javascript/jscomp/AstFactoryTest.java b/test/com/google/javascript/jscomp/AstFactoryTest.java index 03f44fb39bf..cca2b923630 100644 --- a/test/com/google/javascript/jscomp/AstFactoryTest.java +++ b/test/com/google/javascript/jscomp/AstFactoryTest.java @@ -22,7 +22,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.javascript.jscomp.CompilerOptions.LanguageMode; -import com.google.javascript.jscomp.Es6SyntacticScopeCreator.RedeclarationHandler; +import com.google.javascript.jscomp.SyntacticScopeCreator.RedeclarationHandler; import com.google.javascript.rhino.IR; import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Token; @@ -101,11 +101,10 @@ private AstFactory createTestAstFactoryWithoutTypes() { } private Scope getScope(Node root) { - // Normal passes use Es6SyntacticScopeCreator, so that's what we use here. + // Normal passes use SyntacticScopeCreator, so that's what we use here. RedeclarationHandler redeclarationHandler = (Scope s, String name, Node n, CompilerInput input) -> {}; - Es6SyntacticScopeCreator scopeCreator = - new Es6SyntacticScopeCreator(compiler, redeclarationHandler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler, redeclarationHandler); return scopeCreator.createScope(root, null); } diff --git a/test/com/google/javascript/jscomp/CrossChunkReferenceCollectorTest.java b/test/com/google/javascript/jscomp/CrossChunkReferenceCollectorTest.java index 45e60867ad3..b71ea107944 100644 --- a/test/com/google/javascript/jscomp/CrossChunkReferenceCollectorTest.java +++ b/test/com/google/javascript/jscomp/CrossChunkReferenceCollectorTest.java @@ -54,7 +54,7 @@ protected int getNumRepetitions() { @Override protected CompilerPass getProcessor(final Compiler compiler) { - ScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + ScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); testedCollector = new CrossChunkReferenceCollector(compiler, scopeCreator); return testedCollector; } diff --git a/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java b/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java index a4ab196552c..89ef1ba8256 100644 --- a/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java +++ b/test/com/google/javascript/jscomp/DataFlowAnalysisTest.java @@ -744,7 +744,7 @@ public Set computeEscapedLocals(String... lines) { assertThat(compiler.getErrors()).isEmpty(); // Create scopes - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); Scope scope = scopeCreator.createScope(n, Scope.createGlobalScope(script)); Scope childScope; if (script.getFirstChild().isFunction()) { diff --git a/test/com/google/javascript/jscomp/GlobalNamespaceTest.java b/test/com/google/javascript/jscomp/GlobalNamespaceTest.java index e4cd669b225..719b7fac0fb 100644 --- a/test/com/google/javascript/jscomp/GlobalNamespaceTest.java +++ b/test/com/google/javascript/jscomp/GlobalNamespaceTest.java @@ -462,7 +462,7 @@ public void testScanFromNodeAddsReferenceToParentGetprop() { private AstChange createGlobalAstChangeForNode(Node jsRoot, Node n) { // This only creates a global scope, so don't use this with local nodes - Scope globalScope = new Es6SyntacticScopeCreator(lastCompiler).createScope(jsRoot, null); + Scope globalScope = new SyntacticScopeCreator(lastCompiler).createScope(jsRoot, null); // I don't know if lastCompiler.getModules() is correct but it works return new AstChange(Iterables.getFirst(lastCompiler.getModules(), null), globalScope, n); } diff --git a/test/com/google/javascript/jscomp/LiveVariablesAnalysisTest.java b/test/com/google/javascript/jscomp/LiveVariablesAnalysisTest.java index 258cee464b0..ec4e93126b2 100644 --- a/test/com/google/javascript/jscomp/LiveVariablesAnalysisTest.java +++ b/test/com/google/javascript/jscomp/LiveVariablesAnalysisTest.java @@ -593,7 +593,7 @@ private static LiveVariablesAnalysis computeLiveness(String src, boolean async) assertThat(compiler.getErrors()).isEmpty(); // Create scopes - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); Scope scope = scopeCreator.createScope(n, Scope.createGlobalScope(script)); Scope childScope = scopeCreator.createScope(NodeUtil.getFunctionBody(n), scope); @@ -605,7 +605,7 @@ private static LiveVariablesAnalysis computeLiveness(String src, boolean async) // Compute liveness of variables LiveVariablesAnalysis analysis = new LiveVariablesAnalysis( - cfg, scope, childScope, compiler, new Es6SyntacticScopeCreator(compiler)); + cfg, scope, childScope, compiler, new SyntacticScopeCreator(compiler)); analysis.analyze(); return analysis; } diff --git a/test/com/google/javascript/jscomp/MaybeReachingVariableUseTest.java b/test/com/google/javascript/jscomp/MaybeReachingVariableUseTest.java index b7f66f8b7b0..4cc741c2670 100644 --- a/test/com/google/javascript/jscomp/MaybeReachingVariableUseTest.java +++ b/test/com/google/javascript/jscomp/MaybeReachingVariableUseTest.java @@ -205,7 +205,7 @@ private void computeUseDef(String src, boolean async) { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_2018); compiler.initOptions(options); - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); src = (async ? "async " : "") + "function _FUNCTION(param1, param2){" + src + "}"; Node script = compiler.parseTestCode(src); Node root = script.getFirstChild(); diff --git a/test/com/google/javascript/jscomp/MemoizedScopeCreatorTest.java b/test/com/google/javascript/jscomp/MemoizedScopeCreatorTest.java index d3ed5f5c973..fe6ded60882 100644 --- a/test/com/google/javascript/jscomp/MemoizedScopeCreatorTest.java +++ b/test/com/google/javascript/jscomp/MemoizedScopeCreatorTest.java @@ -34,7 +34,7 @@ public void testMemoization() { Node root2 = new Node(Token.ROOT); Compiler compiler = new Compiler(); compiler.initOptions(new CompilerOptions()); - ScopeCreator creator = new MemoizedScopeCreator(new Es6SyntacticScopeCreator(compiler)); + ScopeCreator creator = new MemoizedScopeCreator(new SyntacticScopeCreator(compiler)); Scope scopeA = (Scope) creator.createScope(root1, null); assertThat(creator.createScope(root1, null)).isSameInstanceAs(scopeA); assertThat(creator.createScope(root2, null)).isNotSameInstanceAs(scopeA); @@ -45,7 +45,7 @@ public void testPreconditionCheck() { Compiler compiler = new Compiler(); compiler.initOptions(new CompilerOptions()); Node root = new Node(Token.ROOT); - ScopeCreator creator = new MemoizedScopeCreator(new Es6SyntacticScopeCreator(compiler)); + ScopeCreator creator = new MemoizedScopeCreator(new SyntacticScopeCreator(compiler)); Scope scopeA = (Scope) creator.createScope(root, null); boolean handled = false; diff --git a/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java b/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java index 75b7873555f..7b2449062ca 100644 --- a/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java +++ b/test/com/google/javascript/jscomp/MustBeReachingVariableDefTest.java @@ -236,7 +236,7 @@ private void computeDefUse(String src) { compiler.init(ImmutableList.of(), ImmutableList.of(), options); compiler.getOptions().setLanguageIn(LanguageMode.ECMASCRIPT_2017); compiler.getOptions().setLanguageOut(LanguageMode.ECMASCRIPT_2017); - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); src = "function _FUNCTION(param1, param2){" + src + "}"; Node script = compiler.parseTestCode(src); Node root = script.getFirstChild(); diff --git a/test/com/google/javascript/jscomp/NodeTraversalTest.java b/test/com/google/javascript/jscomp/NodeTraversalTest.java index d77ea349fc7..0abef44f842 100644 --- a/test/com/google/javascript/jscomp/NodeTraversalTest.java +++ b/test/com/google/javascript/jscomp/NodeTraversalTest.java @@ -59,7 +59,7 @@ public void testReport() { }); compiler.initCompilerOptionsIfTesting(); - NodeTraversal t = new NodeTraversal(compiler, null, new Es6SyntacticScopeCreator(compiler)); + NodeTraversal t = new NodeTraversal(compiler, null, new SyntacticScopeCreator(compiler)); DiagnosticType dt = DiagnosticType.warning("FOO", "{0}, {1} - {2}"); t.report(new Node(Token.EMPTY), dt, "Foo", "Bar", "Hello"); @@ -352,7 +352,7 @@ public void visit(NodeTraversal t, Node n, Node parent) { @Test public void testGetCurrentNode() { Compiler compiler = new Compiler(); - ScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + ScopeCreator creator = new SyntacticScopeCreator(compiler); ExpectNodeOnEnterScope callback = new ExpectNodeOnEnterScope(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); @@ -390,7 +390,7 @@ public void testTraverseAtScopeWithBlockScope() { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_NEXT); compiler.initOptions(options); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); ExpectNodeOnEnterScope callback = new ExpectNodeOnEnterScope(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); @@ -422,7 +422,7 @@ public void testTraverseAtScopeWithForScope() { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_2015); compiler.initOptions(options); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); ExpectNodeOnEnterScope callback = new ExpectNodeOnEnterScope(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); @@ -459,7 +459,7 @@ public void testTraverseAtScopeWithSwitchScope() { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_2015); compiler.initOptions(options); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); ExpectNodeOnEnterScope callback = new ExpectNodeOnEnterScope(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); @@ -495,7 +495,7 @@ public void testTraverseAtScopeWithModuleScope() { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_NEXT); compiler.initOptions(options); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); ExpectNodeOnEnterScope callback = new ExpectNodeOnEnterScope(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); @@ -522,7 +522,7 @@ public void testGetVarAccessible() { CompilerOptions options = new CompilerOptions(); options.setLanguageIn(LanguageMode.ECMASCRIPT_2015); compiler.initOptions(options); - Es6SyntacticScopeCreator creator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator creator = new SyntacticScopeCreator(compiler); AccessibleCallback callback = new AccessibleCallback(); NodeTraversal t = new NodeTraversal(compiler, callback, creator); diff --git a/test/com/google/javascript/jscomp/NodeUtilTest.java b/test/com/google/javascript/jscomp/NodeUtilTest.java index bd8c82a2848..b3a42ac8f11 100644 --- a/test/com/google/javascript/jscomp/NodeUtilTest.java +++ b/test/com/google/javascript/jscomp/NodeUtilTest.java @@ -3243,7 +3243,7 @@ public void testGetGoogRequireInfo_returnsNullForShadowedRequires() { ParseHelper parser = new ParseHelper(); Node first = parser.parse(src); // Build the three layers of scopes: global scope, module scope, and block scope. - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(parser.compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(parser.compiler); Scope globalScope = scopeCreator.createScope(first, null); Node module = getNode(first, Token.MODULE_BODY); Scope moduleScope = scopeCreator.createScope(module, globalScope); @@ -3395,7 +3395,7 @@ public void testGetAllVars1() { String fnString = "var h; function g(x, y) {var z; h = 2; {let a; const b = 1} let c}"; Compiler compiler = new Compiler(); compiler.setLifeCycleStage(LifeCycleStage.NORMALIZED); - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); Node ast = parse(fnString); Node functionNode = parseFirst(FUNCTION, fnString); @@ -3423,7 +3423,7 @@ public void testGetAllVars2() { Compiler compiler = new Compiler(); compiler.setLifeCycleStage(LifeCycleStage.NORMALIZED); - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); Node ast = parse(fnString); Node functionNode = parseFirst(FUNCTION, fnString); @@ -3706,7 +3706,7 @@ public static Iterable cases() { public void test() { ParseHelper parser = new ParseHelper(); Node first = parser.parse(src); - Es6SyntacticScopeCreator scopeCreator = new Es6SyntacticScopeCreator(parser.compiler); + SyntacticScopeCreator scopeCreator = new SyntacticScopeCreator(parser.compiler); Scope globalScope = scopeCreator.createScope(first, null); Node module = getNodeOrNull(first, Token.MODULE_BODY); Scope localScope = diff --git a/test/com/google/javascript/jscomp/ReferenceCollectingCallbackTest.java b/test/com/google/javascript/jscomp/ReferenceCollectingCallbackTest.java index 2108069794c..1196ce0cabb 100644 --- a/test/com/google/javascript/jscomp/ReferenceCollectingCallbackTest.java +++ b/test/com/google/javascript/jscomp/ReferenceCollectingCallbackTest.java @@ -53,7 +53,7 @@ protected int getNumRepetitions() { @Override protected CompilerPass getProcessor(final Compiler compiler) { - ScopeCreator scopeCreator = new Es6SyntacticScopeCreator(compiler); + ScopeCreator scopeCreator = new SyntacticScopeCreator(compiler); return new ReferenceCollectingCallback( compiler, this.behavior, @@ -436,7 +436,7 @@ public void testProcessScopeThatsNotABasicBlock() { // Tests the case where the scope we pass in is not really a basic block, but we create a new // basic block anyway because ReferenceCollectingCallback expects all nodes to be in a block. Compiler compiler = createCompiler(); - Es6SyntacticScopeCreator es6SyntacticScopeCreator = new Es6SyntacticScopeCreator(compiler); + SyntacticScopeCreator syntacticScopeCreator = new SyntacticScopeCreator(compiler); ReferenceCollectingCallback referenceCollectingCallback = new ReferenceCollectingCallback( compiler, @@ -455,14 +455,14 @@ public void afterExitScope(NodeTraversal t, ReferenceMap rm) { assertNode(secondBasicBlock.getRoot().getParent()).hasType(Token.IF); } }, - es6SyntacticScopeCreator); + syntacticScopeCreator); String js = "let x = 5; { let y = x + 1; if (true) { { use(y); } } }"; Node root = compiler.parseTestCode(js); Node block = root.getSecondChild(); - Scope globalScope = es6SyntacticScopeCreator.createScope(root, null); - Scope blockScope = es6SyntacticScopeCreator.createScope(block, globalScope); + Scope globalScope = syntacticScopeCreator.createScope(root, null); + Scope blockScope = syntacticScopeCreator.createScope(block, globalScope); referenceCollectingCallback.processScope(blockScope); } } diff --git a/test/com/google/javascript/jscomp/Es6SyntacticScopeCreatorTest.java b/test/com/google/javascript/jscomp/SyntacticScopeCreatorTest.java similarity index 99% rename from test/com/google/javascript/jscomp/Es6SyntacticScopeCreatorTest.java rename to test/com/google/javascript/jscomp/SyntacticScopeCreatorTest.java index 1e90902a2a8..b5765aa6b98 100644 --- a/test/com/google/javascript/jscomp/Es6SyntacticScopeCreatorTest.java +++ b/test/com/google/javascript/jscomp/SyntacticScopeCreatorTest.java @@ -27,7 +27,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multiset; import com.google.javascript.jscomp.CompilerOptions.LanguageMode; -import com.google.javascript.jscomp.Es6SyntacticScopeCreator.RedeclarationHandler; +import com.google.javascript.jscomp.SyntacticScopeCreator.RedeclarationHandler; import com.google.javascript.rhino.Node; import com.google.javascript.rhino.Token; import org.junit.Before; @@ -36,15 +36,15 @@ import org.junit.runners.JUnit4; /** - * Tests for {@link Es6SyntacticScopeCreator}. + * Tests for {@link SyntacticScopeCreator}. * * @author moz@google.com (Michael Zhou) */ @RunWith(JUnit4.class) -public final class Es6SyntacticScopeCreatorTest { +public final class SyntacticScopeCreatorTest { private Compiler compiler; - private Es6SyntacticScopeCreator scopeCreator; + private SyntacticScopeCreator scopeCreator; private Multiset redeclarations; private class RecordingRedeclarationHandler implements RedeclarationHandler { @@ -75,7 +75,7 @@ public void setUp() throws Exception { compiler.initOptions(options); redeclarations = HashMultiset.create(); RedeclarationHandler handler = new RecordingRedeclarationHandler(); - scopeCreator = new Es6SyntacticScopeCreator(compiler, handler); + scopeCreator = new SyntacticScopeCreator(compiler, handler); } @Test