Removes and tests too aggressive change recording in Es6RewriteModules.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=165045674
google · Aug 15, 2017 · bbd070a · bbd070a
1 parent ac9038a
commit bbd070a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/com/google/javascript/jscomp/Es6RewriteModules.java b/src/com/google/javascript/jscomp/Es6RewriteModules.java
@@ -633,7 +633,10 @@ private void fixTypeNode(NodeTraversal t, Node typeNode) {
           }
           String globalModuleName = path.toModuleName();
 
-          typeNode.setString(
+          maybeSetNewName(
+              t,
+              typeNode,
+              name,
               localTypeName == null ? globalModuleName : globalModuleName + localTypeName);
         } else {
           List<String> splitted = Splitter.on('.').limit(2).splitToList(name);
@@ -644,13 +647,13 @@ private void fixTypeNode(NodeTraversal t, Node typeNode) {
           }
           Var var = t.getScope().getVar(baseName);
           if (var != null && var.isGlobal()) {
-            typeNode.setString(baseName + "$$" + suffix + rest);
+            maybeSetNewName(t, typeNode, name, baseName + "$$" + suffix + rest);
           } else if (var == null && importMap.containsKey(baseName)) {
             ModuleOriginalNamePair pair = importMap.get(baseName);
             if (pair.originalName.isEmpty()) {
-              typeNode.setString(pair.module + rest);
+              maybeSetNewName(t, typeNode, name, pair.module + rest);
             } else {
-              typeNode.setString(baseName + "$$" + pair.module + rest);
+              maybeSetNewName(t, typeNode, name, baseName + "$$" + pair.module + rest);
             }
           }
           typeNode.setOriginalName(name);
@@ -661,7 +664,14 @@ private void fixTypeNode(NodeTraversal t, Node typeNode) {
            child = child.getNext()) {
         fixTypeNode(t, child);
       }
-      t.reportCodeChange();
+    }
+
+    private void maybeSetNewName(NodeTraversal t, Node node, String name, String newName) {
+      if (!name.equals(newName)) {
+        node.setString(newName);
+        node.setOriginalName(name);
+        t.reportCodeChange();
+      }
     }
   }
 

diff --git a/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java b/test/com/google/javascript/jscomp/Es6RewriteModulesTest.java
@@ -399,6 +399,24 @@ public void testRenameTypedef() {
             "module$testcode.UnionType;"));
   }
 
+  public void testNoInnerChange() {
+    testModules(
+        LINE_JOINER.join(
+            "var Foo = (function () {",
+            "    /**  @param bar */",
+            "    function Foo(bar) {}",
+            "    return Foo;",
+            "}());",
+            "export { Foo };"),
+        LINE_JOINER.join(
+            "var Foo$$module$testcode = function() {",
+            "    /**  @param bar */",
+            "    function Foo(bar) {}",
+            "    return Foo;",
+            "}();",
+            "module$testcode.Foo = Foo$$module$testcode;"));
+  }
+
   public void testRenameImportedReference() {
     testModules(
         LINE_JOINER.join(