Make sure to mark const declarations as @const in the type-only summa…

…ries ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=185759522
google · Feb 15, 2018 · 5595b19 · 5595b19
1 parent 966373b
commit 5595b19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/com/google/javascript/jscomp/ijs/JsdocUtil.java b/src/com/google/javascript/jscomp/ijs/JsdocUtil.java
@@ -63,6 +63,12 @@ private static JSDocInfo getConstJSDoc(JSDocInfo oldJSDoc, JSTypeExpression newT
     return builder.build();
   }
 
+  static JSDocInfo markConstant(JSDocInfo oldJSDoc) {
+    JSDocInfoBuilder builder = JSDocInfoBuilder.maybeCopyFrom(oldJSDoc);
+    builder.recordConstancy();
+    return builder.build();
+  }
+
   static JSDocInfo mergeJsdocs(@Nullable JSDocInfo classicJsdoc, @Nullable JSDocInfo inlineJsdoc) {
     if (inlineJsdoc == null || !inlineJsdoc.hasType()) {
       return classicJsdoc;

diff --git a/src/com/google/javascript/jscomp/ijs/PotentialDeclaration.java b/src/com/google/javascript/jscomp/ijs/PotentialDeclaration.java
@@ -208,6 +208,9 @@ void simplify(AbstractCompiler compiler) {
         simplifySymbol(compiler);
         return;
       }
+      if (getLhs().getParent().isConst()) {
+        jsdoc = JsdocUtil.markConstant(jsdoc);
+      }
       // Just completely remove the RHS, and replace with a getprop.
       Node newStatement =
           NodeUtil.newQNameDeclaration(compiler, nameNode.getQualifiedName(), null, jsdoc);

diff --git a/test/com/google/javascript/jscomp/ijs/ConvertToTypedInterfaceTest.java b/test/com/google/javascript/jscomp/ijs/ConvertToTypedInterfaceTest.java
@@ -74,8 +74,7 @@ public void testSimpleConstJsdocPropagation() {
         warning(ConvertToTypedInterface.CONSTANT_WITHOUT_EXPLICIT_TYPE));
   }
 
-  public void disabled_testConstKeywordWithAnnotatedType() {
+  public void testConstKeywordWithAnnotatedType() {
-    // TODO(b/73306304): The @const is currently missing here. Fix this!
     test("/** @type {number} */ const x = 5;", "/** @const {number} */ var x;");
     test("/** @type {!Foo} */ const f = new Foo;", "/** @const {!Foo} */ var f;");
   }