Handle @closurePrimitive in JSDocInfoPrinter and JSDocInfo equivalence

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=241407239
google · Apr 3, 2019 · f64cd02 · f64cd02
1 parent 3fba753
commit f64cd02
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/src/com/google/javascript/jscomp/JSDocInfoPrinter.java b/src/com/google/javascript/jscomp/JSDocInfoPrinter.java
@@ -74,6 +74,7 @@ public String print(JSDocInfo info) {
     //   polymer
     //   polymerBehavior
     //   mixinFunction
+    //   closurePrimitive
     parts.add("/**");
 
     if (info.isExterns()) {
@@ -257,6 +258,10 @@ public String print(JSDocInfo info) {
       parts.add("@customElement");
     }
 
+    if (info.getClosurePrimitiveId() != null) {
+      parts.add("@closurePrimitive {" + info.getClosurePrimitiveId() + "}");
+    }
+
     parts.add("*/");
 
     StringBuilder sb = new StringBuilder();

diff --git a/src/com/google/javascript/jscomp/parsing/JsDocInfoParser.java b/src/com/google/javascript/jscomp/parsing/JsDocInfoParser.java
@@ -251,6 +251,7 @@ private static JsDocInfoParser getParser(String toParse) {
         Config.builder()
             .setLanguageMode(LanguageMode.ECMASCRIPT3)
             .setStrictMode(Config.StrictMode.SLOPPY)
+            .setClosurePrimitiveNames(ImmutableSet.of("testPrimitive"))
             .build();
     JsDocInfoParser parser =
         new JsDocInfoParser(

diff --git a/src/com/google/javascript/rhino/JSDocInfo.java b/src/com/google/javascript/rhino/JSDocInfo.java
@@ -621,6 +621,7 @@ public static boolean areEquivalent(JSDocInfo jsDoc1, JSDocInfo jsDoc2) {
         && Objects.equals(jsDoc1.getType(), jsDoc2.getType())
         && Objects.equals(jsDoc1.getVersion(), jsDoc2.getVersion())
         && Objects.equals(jsDoc1.getVisibility(), jsDoc2.getVisibility())
+        && Objects.equals(jsDoc1.getClosurePrimitiveId(), jsDoc2.getClosurePrimitiveId())
         && jsDoc1.bitset == jsDoc2.bitset;
   }
 

diff --git a/test/com/google/javascript/jscomp/JSDocInfoPrinterTest.java b/test/com/google/javascript/jscomp/JSDocInfoPrinterTest.java
@@ -400,6 +400,11 @@ public void testNoCollapse() {
     testSame("/** @nocollapse */ ");
   }
 
+  @Test
+  public void testClosurePrimitive() {
+    testSame("/** @closurePrimitive {testPrimitive} */ ");
+  }
+
   private void testSame(String jsdoc) {
     test(jsdoc, jsdoc);
   }

diff --git a/test/com/google/javascript/rhino/JSDocInfoTest.java b/test/com/google/javascript/rhino/JSDocInfoTest.java
@@ -645,6 +645,18 @@ public void testContainsDeclaration_extends() {
     assertThat(info.containsDeclaration()).isTrue();
   }
 
+  @Test
+  public void testClosurePrimitiveId_affectsEquality() {
+    JSDocInfo assertsFailJSDoc = new JSDocInfo();
+    assertsFailJSDoc.setClosurePrimitiveId("asserts.fail");
+
+    JSDocInfo otherInfo = new JSDocInfo();
+    assertThat(JSDocInfo.areEquivalent(assertsFailJSDoc, otherInfo)).isFalse();
+
+    otherInfo.setClosurePrimitiveId("asserts.fail");
+    assertThat(JSDocInfo.areEquivalent(assertsFailJSDoc, otherInfo)).isTrue();
+  }
+
   /** Gets the type expression for a simple type name. */
   private JSTypeExpression fromString(String s) {
     return new JSTypeExpression(Node.newString(s), "");