small cleanups and clarifications

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=145841380
google · Jan 28, 2017 · 99e883b · 99e883b
1 parent 35e1e1b
commit 99e883b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java b/src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java
@@ -42,8 +42,7 @@
  *  TODO(johnlenz): Try to merge this with the ScopeCreator.
  *  TODO(moz): Handle more ES6 features, such as default parameters.
  */
-class MakeDeclaredNamesUnique
+class MakeDeclaredNamesUnique implements NodeTraversal.ScopedCallback {
-    implements NodeTraversal.ScopedCallback {
 
   // Arguments is special cased to handle cases where a local name shadows
   // the arguments declaration.
@@ -86,12 +85,11 @@ public void enterScope(NodeTraversal t) {
       // If the contextual renamer is being used, the starting context can not
       // be a function.
       Preconditions.checkState(
-          !declarationRoot.isFunction() ||
+          !declarationRoot.isFunction() || !(rootRenamer instanceof ContextualRenamer));
-          !(rootRenamer instanceof ContextualRenamer));
       Preconditions.checkState(t.inGlobalScope());
       renamer = rootRenamer;
     } else {
-      renamer = nameStack.peek().forChildScope(!NodeUtil.createsBlockScope(declarationRoot));
+      renamer = nameStack.peek().createForChildScope(!NodeUtil.createsBlockScope(declarationRoot));
     }
 
     if (!declarationRoot.isFunction()) {
@@ -118,12 +116,11 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
       case FUNCTION: {
         // Add recursive function name, if needed.
         // NOTE: "enterScope" is called after we need to pick up this name.
-        Renamer renamer = nameStack.peek().forChildScope(false);
+        Renamer renamer = nameStack.peek().createForChildScope(false);
 
         // If needed, add the function recursive name.
         String name = n.getFirstChild().getString();
-        if (name != null && !name.isEmpty() && parent != null
+        if (!name.isEmpty() && parent != null && !NodeUtil.isFunctionDeclaration(n)) {
-            && !NodeUtil.isFunctionDeclaration(n)) {
           renamer.addDeclaredName(name, false);
         }
 
@@ -132,7 +129,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
       }
 
       case PARAM_LIST: {
-        Renamer renamer = nameStack.peek().forChildScope(true);
+        Renamer renamer = nameStack.peek().createForChildScope(true);
 
         // Add the function parameters
         for (Node c = n.getFirstChild(); c != null; c = c.getNext()) {
@@ -148,7 +145,7 @@ public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
       }
 
       case CATCH: {
-        Renamer renamer = nameStack.peek().forChildScope(false);
+        Renamer renamer = nameStack.peek().createForChildScope(false);
 
         String name = n.getFirstChild().getString();
         renamer.addDeclaredName(name, false);
@@ -264,7 +261,7 @@ interface Renamer {
     /**
      * @return A Renamer for a scope within the scope of the current Renamer.
      */
-    Renamer forChildScope(boolean hoisted);
+    Renamer createForChildScope(boolean hoisted);
 
     /**
      * @return The closest hoisting target for var and function declarations.
@@ -482,7 +479,7 @@ private ContextualRenamer(
      * Create a ContextualRenamer
      */
     @Override
-    public Renamer forChildScope(boolean hoistingTargetScope) {
+    public Renamer createForChildScope(boolean hoistingTargetScope) {
       return new ContextualRenamer(nameUsage, hoistingTargetScope, this);
     }
 
@@ -624,7 +621,7 @@ public String getReplacementName(String oldName) {
     }
 
     @Override
-    public Renamer forChildScope(boolean hoistingTargetScope) {
+    public Renamer createForChildScope(boolean hoistingTargetScope) {
       return new InlineRenamer(
           convention, uniqueIdSupplier, idPrefix, removeConstness, hoistingTargetScope, this);
     }
@@ -659,7 +656,7 @@ static class BoilerplateRenamer extends ContextualRenamer {
     }
 
     @Override
-    public Renamer forChildScope(boolean hoisted) {
+    public Renamer createForChildScope(boolean hoisted) {
       return new InlineRenamer(convention, uniqueIdSupplier, idPrefix, false, hoisted, this);
     }
   }
@@ -693,8 +690,8 @@ public boolean stripConstIfReplaced() {
     }
 
     @Override
-    public Renamer forChildScope(boolean hoistingTargetScope) {
+    public Renamer createForChildScope(boolean hoistingTargetScope) {
-      return new WhitelistedRenamer(delegate.forChildScope(hoistingTargetScope), whitelist);
+      return new WhitelistedRenamer(delegate.createForChildScope(hoistingTargetScope), whitelist);
     }
 
     @Override

diff --git a/test/com/google/javascript/jscomp/NormalizeTest.java b/test/com/google/javascript/jscomp/NormalizeTest.java
@@ -410,10 +410,10 @@ public void testRemoveDuplicateVarDeclarations1() {
          "function f() { var a = 1; a = 2 }");
     test("var a = 1; function f(){ var a = 2 }",
          "var a = 1; function f(){ var a$jscomp$1 = 2 }");
-    test("function f() { var a = 1; lable1:var a = 2 }",
+    test("function f() { var a = 1; label1:var a = 2 }",
-         "function f() { var a = 1; lable1:{a = 2}}");
+         "function f() { var a = 1; label1:{a = 2}}");
-    test("function f() { var a = 1; lable1:var a }",
+    test("function f() { var a = 1; label1:var a }",
-         "function f() { var a = 1; lable1:{} }");
+         "function f() { var a = 1; label1:{} }");
     test("function f() { var a = 1; for(var a in b); }",
          "function f() { var a = 1; for(a in b); }");
   }