Handle import * in MakeDeclaredNamesUnique.

We should treat an IMPORT_STAR node like a name node here. Also updates the unit tests to better test renaming exported and imported names.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172122689

src/com/google/javascript/jscomp/MakeDeclaredNamesUnique.java

@@ -109,6 +109,7 @@ public void exitScope(NodeTraversal t) {
   public void visit(NodeTraversal t, Node n, Node parent) {
     switch (n.getToken()) {
       case NAME:
+      case IMPORT_STAR:
         visitName(t, n, parent);
         break;
 
@@ -309,7 +310,7 @@ void handleScopeVar(Var v) {
         referencedNames.add(newName);
         List<Node> references = nameMap.get(name);
         for (Node n : references) {
-          checkState(n.isName(), n);
+          checkState(n.isName() || n.isImportStar(), n);
           n.setString(newName);
           if (markChanges) {
             compiler.reportChangeToEnclosingScope(n);
@@ -357,7 +358,7 @@ public void visit(NodeTraversal t, Node node, Node parent) {
         return;
       }
 
-      if (NodeUtil.isReferenceName(node)) {
+      if (NodeUtil.isReferenceName(node) || node.isImportStar()) {
         String name = node.getString();
         // Add all referenced names to the set so it is possible to check for
         // conflicts.

test/com/google/javascript/jscomp/MakeDeclaredNamesUniqueTest.java

@@ -80,6 +80,14 @@ private void testWithInversion(String original, String expected) {
     invert = false;
   }
 
+  private void testWithInversion(String[] original, String[] expected) {
+    invert = false;
+    test(original, expected);
+    invert = true;
+    test(expected, original);
+    invert = false;
+  }
+
   private void testSameWithInversion(String externs, String original) {
     invert = false;
     testSame(externs, original);
@@ -936,7 +944,21 @@ public void testExportedOrImportedNamesAreUntouched() {
     // The eventual desired behavior is that none of the 'a's in the following test cases
     // are renamed to a$jscomp$1. Rewrite this test after that behavior is implemented.
     this.useDefaultRenamer = true;
-    testSame("var a; export {a as a};");
-    testSame("var a; import {a as a} from './bar.js'");
+    test(
+        new String[] {"var a;", "let a; export {a as a};"},
+        new String[] {"var a;", "let a$jscomp$1; export {a$jscomp$1 as a};"});
+
+    test(
+        new String[] {"var a;", "import {a as a} from './foo.js'; let b = a;"},
+        new String[] {"var a;", "import {a as a$jscomp$1} from './foo.js'; let b = a$jscomp$1;"});
+  }
+
+  public void testImportStarWithInversion() {
+    this.useDefaultRenamer = true;
+    testWithInversion(
+        new String[] {"let a = 5;", "import * as a from './a.js'; const TAU = 2 * a.PI;"},
+        new String[] {
+          "let a = 5;", "import * as a$jscomp$1 from './a.js'; const TAU = 2 * a$jscomp$1.PI"
+        });
   }
 }

test/com/google/javascript/jscomp/NormalizeTest.java

@@ -488,6 +488,22 @@ public void testMakeLocalNamesUnique() {
     // Verify local masking extern made unique.
     test("function f() {var window}",
         "function f() {var window$jscomp$1}");
+
+    // Verify import * as <alias> is renamed.
+    test(
+        new String[] {"let a = 5;", "import * as a from './a.js'; const TAU = 2 * a.PI;"},
+        new String[] {
+          "let a = 5;", "import * as a$jscomp$1 from './a.js'; const TAU = 2 * a$jscomp$1.PI"
+        });
+
+    // Verify exported and imported names are untouched.
+    test(
+        new String[] {"var a;", "let a; export {a as a};"},
+        new String[] {"var a;", "let a$jscomp$1; export {a$jscomp$1 as a};"});
+
+    test(
+        new String[] {"var a;", "import {a as a} from './foo.js'; let b = a;"},
+        new String[] {"var a;", "import {a as a$jscomp$1} from './foo.js'; let b = a$jscomp$1;"});
   }
 
   public void testMakeParamNamesUnique() {