Properly parse 'as const'

tree-sitter · Jul 12, 2023 · e82410a · e82410a
1 parent a232b3a
commit e82410a
Show file tree

Hide file tree

Showing 6 changed files with 206,908 additions and 206,675 deletions.
diff --git a/common/corpus/declarations.txt b/common/corpus/declarations.txt
@@ -457,6 +457,7 @@ Type casts
 
 foo as any as Array<number>
 bar satisfies number[]
+"foobar" as const
 
 ---
 
@@ -466,7 +467,11 @@ bar satisfies number[]
       (as_expression (identifier) (predefined_type))
       (generic_type (type_identifier) (type_arguments (predefined_type)))))
   (expression_statement
-    (satisfies_expression (identifier) (array_type (predefined_type)))))
+    (satisfies_expression (identifier) (array_type (predefined_type))))
+  (expression_statement
+    (as_expression
+      (string
+        (string_fragment)))))
 
 =================================
 Ambient export function declarations

diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -438,7 +438,7 @@ module.exports = function defineGrammar(dialect) {
       as_expression: $ => prec.left('binary', seq(
         $.expression,
         'as',
-        $._type
+        choice('const', $._type)
       )),
 
       satisfies_expression: $ => prec.left('binary', seq(

diff --git a/tsx/src/grammar.json b/tsx/src/grammar.json
@@ -7573,8 +7573,17 @@
             "value": "as"
           },
           {
-            "type": "SYMBOL",
-            "name": "_type"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "const"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_type"
+              }
+            ]
           }
         ]
       }