Parse string literal annotations as correct type

Summary: Previously we were parsing these to `StringLiteral`, when they should be `StringLiteralTypeAnnotation`, just like the other literal annotations. Add the node. Reviewed By: tmikov Differential Revision: D23088830 fbshipit-source-id: 57a1fbf845b69d228ea8d6a79dc19e1b962373c3
gfx · Oct 27, 2020 · f4f93eb · f4f93eb
1 parent af2ac8b
commit f4f93eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/include/hermes/AST/ESTree.def b/include/hermes/AST/ESTree.def
@@ -656,6 +656,9 @@ ESTREE_NODE_0_ARGS(ExistsTypeAnnotation, Base)
 ESTREE_NODE_0_ARGS(EmptyTypeAnnotation, Base)
 ESTREE_NODE_0_ARGS(StringTypeAnnotation, Base)
 ESTREE_NODE_0_ARGS(NumberTypeAnnotation, Base)
+ESTREE_NODE_1_ARGS(
+    StringLiteralTypeAnnotation, Base,
+    NodeLabel, value, false)
 ESTREE_NODE_2_ARGS(
     NumberLiteralTypeAnnotation, Base,
     NodeNumber, value, false,

diff --git a/lib/Parser/JSParserImpl-flow.cpp b/lib/Parser/JSParserImpl-flow.cpp
@@ -1021,7 +1021,7 @@ Optional<ESTree::Node *> JSParserImpl::parsePrimaryTypeAnnotation() {
       return setLocation(
           start,
           advance(JSLexer::GrammarContext::Flow).End,
-          new (context_) ESTree::StringLiteralNode(str));
+          new (context_) ESTree::StringLiteralTypeAnnotationNode(str));
     }
 
     case TokenKind::numeric_literal: {

diff --git a/test/Parser/flow/primitive.js b/test/Parser/flow/primitive.js
@@ -184,7 +184,7 @@ type A = 'foo';
 // CHECK-NEXT:       },
 // CHECK-NEXT:       "typeParameters": null,
 // CHECK-NEXT:       "right": {
-// CHECK-NEXT:         "type": "StringLiteral",
+// CHECK-NEXT:         "type": "StringLiteralTypeAnnotation",
 // CHECK-NEXT:         "value": "foo"
 // CHECK-NEXT:       }
 // CHECK-NEXT:     }

diff --git a/utils/testsuite/esprima_test_runner.py b/utils/testsuite/esprima_test_runner.py
@@ -45,6 +45,7 @@ class TestStatus(enum.IntEnum):
     # Some literals support "raw" and others don't.
     # ESPrima doesn't distinguish.
     "Literal": {"raw"},
+    "StringLiteralTypeAnnotation": {"raw"},
 }
 ESPRIMA_OMITTED_KEYS = {
     "Program": {"tokens", "sourceType", "comments"},