When JSDoc in a goog.module references an "inner class" make fix mode…

… do the correct replacement. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=148934826
google · Mar 2, 2017 · 488845b · 488845b
1 parent 1e487e4
commit 488845b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/src/com/google/javascript/refactoring/ErrorToFixMapper.java b/src/com/google/javascript/refactoring/ErrorToFixMapper.java
@@ -201,19 +201,25 @@ private static SuggestedFix getFixForReferenceToShortImportByLongName(
     NodeMetadata metadata = new NodeMetadata(compiler);
     Match match = new Match(error.node, metadata);
 
+    Matcher fullNameMatcher = FULLY_QUALIFIED_NAME.matcher(error.description);
+    Preconditions.checkState(fullNameMatcher.matches(), error.description);
+    String fullName = fullNameMatcher.group(1);
+
     Matcher shortNameMatcher = USE_SHORT_NAME.matcher(error.description);
     String shortName;
     if (shortNameMatcher.matches()) {
       shortName = shortNameMatcher.group(1);
     } else {
-      Matcher fullNameMatcher = FULLY_QUALIFIED_NAME.matcher(error.description);
+      shortName = fullName.substring(fullName.lastIndexOf('.') + 1);
-      Preconditions.checkState(fullNameMatcher.matches(), error.description);
+      fix.addLhsToGoogRequire(match, fullName);
-      String namespace = fullNameMatcher.group(1);
-      shortName = namespace.substring(namespace.lastIndexOf('.') + 1);
-      fix.addLhsToGoogRequire(match, namespace);
     }
 
-    return fix.replace(error.node, NodeUtil.newQName(compiler, shortName), compiler).build();
+    String oldName =
+        error.node.isQualifiedName() ? error.node.getQualifiedName() : error.node.getString();
+
+    return fix.replace(
+            error.node, NodeUtil.newQName(compiler, oldName.replace(fullName, shortName)), compiler)
+        .build();
   }
 
   private static List<SuggestedFix> getFixesForImplicitlyNullableJsDoc(

diff --git a/test/com/google/javascript/refactoring/ErrorToFixMapperTest.java b/test/com/google/javascript/refactoring/ErrorToFixMapperTest.java
@@ -892,6 +892,40 @@ public void testSwitchToShorthand_JSDoc6() {
             "var animals;"));
   }
 
+  @Test
+  public void testSwitchToShorthand_JSDoc7() {
+    assertChanges(
+        LINE_JOINER.join(
+            "goog.module('m');",
+            "var Animal = goog.require('world.util.Animal');",
+            "",
+            "/** @type {?Array<world.util.Animal.Turtle>} */",
+            "var turtles;"),
+        LINE_JOINER.join(
+            "goog.module('m');",
+            "var Animal = goog.require('world.util.Animal');",
+            "",
+            "/** @type {?Array<Animal.Turtle>} */",
+            "var turtles;"));
+  }
+
+  @Test
+  public void testSwitchToShorthand_JSDoc8() {
+    assertChanges(
+        LINE_JOINER.join(
+            "goog.module('m');",
+            "var AnimalAltName = goog.require('world.util.Animal');",
+            "",
+            "/** @type {?Array<world.util.Animal.Turtle>} */",
+            "var turtles;"),
+        LINE_JOINER.join(
+            "goog.module('m');",
+            "var AnimalAltName = goog.require('world.util.Animal');",
+            "",
+            "/** @type {?Array<AnimalAltName.Turtle>} */",
+            "var turtles;"));
+  }
+
   @Test
   public void testMissingRequireInGoogModule_atExtends_qname() {
     assertChanges(