Edit the text of "Reference to fully qualified import name" warning

This is to make it clearer what the intended fix should be in case there is no "short name" yet. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129680669
google · Aug 8, 2016 · ca17ffe · ca17ffe
1 parent 75d0d95
commit ca17ffe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/com/google/javascript/jscomp/ClosureCheckModule.java b/src/com/google/javascript/jscomp/ClosureCheckModule.java
@@ -20,7 +20,6 @@
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
 import com.google.javascript.rhino.Token;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -91,10 +90,11 @@ public final class ClosureCheckModule extends AbstractModuleCallback
           "JSC_REFERENCE_TO_MODULE_GLOBAL_NAME",
           "References to the global name of a module are not allowed. Perhaps you meant exports?");
 
-  static final DiagnosticType REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME =
+  static final DiagnosticType REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME =
       DiagnosticType.disabled(
-          "JSC_REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME",
+          "JSC_REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME",
-          "Reference to fully qualified import name ''{0}''. Please use the short name instead.");
+          "Reference to fully qualified import name ''{0}''."
+              + " Imports in goog.module should use the return value of goog.require instead.");
 
   static final DiagnosticType REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME_INCLUDING_SHORT_NAME =
       DiagnosticType.disabled(
@@ -205,7 +205,7 @@ public void visit(NodeTraversal t, Node n, Node parent) {
         } else if (shortRequiredNamespaces.containsKey(n.getQualifiedName())) {
           String shortName = shortRequiredNamespaces.get(n.getQualifiedName());
           if (shortName == null) {
-            t.report(n, REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME, n.getQualifiedName());
+            t.report(n, REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME, n.getQualifiedName());
           } else {
             t.report(n, REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME_INCLUDING_SHORT_NAME,
                 n.getQualifiedName(), shortName);

diff --git a/src/com/google/javascript/jscomp/DiagnosticGroups.java b/src/com/google/javascript/jscomp/DiagnosticGroups.java
@@ -533,7 +533,7 @@ public DiagnosticGroup forName(String name) {
               CheckUnusedLabels.UNUSED_LABEL,
               CheckUselessBlocks.USELESS_BLOCK,
               ClosureCheckModule.LET_GOOG_REQUIRE,
-              ClosureCheckModule.REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME,
+              ClosureCheckModule.REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME,
               ClosureCheckModule.REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME_INCLUDING_SHORT_NAME,
               ClosureRewriteModule.USELESS_USE_STRICT_DIRECTIVE,
               RhinoErrorReporter.JSDOC_MISSING_BRACES_WARNING,

diff --git a/test/com/google/javascript/jscomp/ClosureCheckModuleTest.java b/test/com/google/javascript/jscomp/ClosureCheckModuleTest.java
@@ -24,8 +24,8 @@
 import static com.google.javascript.jscomp.ClosureCheckModule.MODULE_AND_PROVIDES;
 import static com.google.javascript.jscomp.ClosureCheckModule.MULTIPLE_MODULES_IN_FILE;
 import static com.google.javascript.jscomp.ClosureCheckModule.ONE_REQUIRE_PER_DECLARATION;
+import static com.google.javascript.jscomp.ClosureCheckModule.REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME;
 import static com.google.javascript.jscomp.ClosureCheckModule.REFERENCE_TO_MODULE_GLOBAL_NAME;
-import static com.google.javascript.jscomp.ClosureCheckModule.REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME;
 import static com.google.javascript.jscomp.ClosureCheckModule.REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME_INCLUDING_SHORT_NAME;
 import static com.google.javascript.jscomp.ClosureCheckModule.REQUIRE_NOT_AT_TOP_LEVEL;
 
@@ -358,7 +358,7 @@ public void testIllegalShortImportDestructuring() {
             "var {doThing} = goog.require('foo.utils');",
             "",
             "exports = function() { return foo.utils.doThing(''); };"),
-        REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME);
+        REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME);
   }
 
   public void testIllegalImportNoAlias() {
@@ -369,7 +369,7 @@ public void testIllegalImportNoAlias() {
             "goog.require('foo.utils');",
             "",
             "exports = function() { return foo.utils.doThing(''); };"),
-        REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME);
+        REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME);
   }
 
   // TODO(johnlenz): Re-enable these tests (they are a bit tricky).
@@ -381,7 +381,7 @@ public void disable_testSingleNameImportNoAlias1() {
             "goog.require('foo');",
             "",
             "exports = function() { return foo.doThing(''); };"),
-        REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME);
+        REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME);
   }
 
   public void disable_testSingleNameImportWithAlias() {
@@ -392,7 +392,7 @@ public void disable_testSingleNameImportWithAlias() {
             "var bar = goog.require('foo');",
             "",
             "exports = function() { return foo.doThing(''); };"),
-        REFERENCE_TO_SHORT_IMPORT_BY_LONG_NAME);
+        REFERENCE_TO_FULLY_QUALIFIED_IMPORT_NAME);
   }
 
   public void testSingleNameImportCrossAlias() {