fix: expose string fragments in template string types

tree-sitter · Feb 10, 2024 · 72f8aaf · 72f8aaf
1 parent 7db8390
commit 72f8aaf
Show file tree

Hide file tree

Showing 9 changed files with 489,444 additions and 489,471 deletions.
diff --git a/common/corpus/expressions.txt b/common/corpus/expressions.txt
@@ -12,7 +12,8 @@ T as {} & { [t: T]: T } & { [g: G]: G }
   (expression_statement
     (as_expression
       (identifier)
-      (template_literal_type)))
+      (template_literal_type
+        (string_fragment))))
   (expression_statement
     (as_expression
       (identifier)
@@ -57,7 +58,8 @@ T satisfies {} & { [t: T]: T } & { [g: G]: G }
   (expression_statement
     (satisfies_expression
       (identifier)
-      (template_literal_type)))
+      (template_literal_type
+        (string_fragment))))
   (expression_statement
     (satisfies_expression
       (identifier)

diff --git a/common/corpus/types.txt b/common/corpus/types.txt
@@ -1765,8 +1765,10 @@ type StringToNumber<S extends string> = S extends `${infer N extends number}` ?
           (type_identifier)
           (literal_type
             (number))))
+      (string_fragment)
       (template_type
         (type_identifier))
+      (string_fragment)
       (template_type
         (generic_type
           (type_identifier)
@@ -1776,13 +1778,15 @@ type StringToNumber<S extends string> = S extends `${infer N extends number}` ?
   (type_alias_declaration
     (type_identifier)
     (template_literal_type
+      (string_fragment)
       (template_type
         (literal_type
           (string
             (string_fragment))))
       (template_type
         (literal_type
-          (number)))))
+          (number)))
+      (string_fragment)))
   (type_alias_declaration
     (type_identifier)
     (type_parameters
@@ -1886,6 +1890,7 @@ type A<B> = { [B in keyof C & string as `${P}1` | `${P}2`]: A[B] }
               (type_identifier))
             (predefined_type))
           (template_literal_type
+            (string_fragment)
             (template_type
               (generic_type
                 (type_identifier)
@@ -1913,10 +1918,12 @@ type A<B> = { [B in keyof C & string as `${P}1` | `${P}2`]: A[B] }
           (union_type
             (template_literal_type
               (template_type
-                (type_identifier)))
+                (type_identifier))
+              (string_fragment))
             (template_literal_type
               (template_type
-                (type_identifier)))))
+                (type_identifier))
+              (string_fragment))))
         (type_annotation
           (lookup_type
             (type_identifier)

diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -749,7 +749,7 @@ module.exports = function defineGrammar(dialect) {
       template_literal_type: ($) => seq(
         '`',
         repeat(choice(
-          $._template_chars,
+          alias($._template_chars, $.string_fragment),
           $.template_type,
         )),
         '`',

diff --git a/tsx/src/grammar.json b/tsx/src/grammar.json