fix(fe): don't treat '<A & B>expr' as a JSX element

quick-lint · Dec 20, 2023 · 0f20583 · 0f20583
1 parent 970c4d5
commit 0f20583
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -76,8 +76,7 @@ Semantic Versioning.
   * `interface I { get: any; }` (field named `get` with a type annotation) no
     longer reports [E0054][] ("unexpected token"). (Implemented by [Rui
     Serra][].)
-  * In type assertions, certain types (array types, generic arrow types, and
-    type references with a namespace) such as in `<string[]>expr` and
+  * In type assertions, certain types such as in `<string[]>expr` and
     `< <T>() => RT>expr`, are no longer incorrectly interpreted as JSX.
 
 ## 2.18.0 (2023-11-03)

diff --git a/src/quick-lint-js/fe/parse-expression.cpp b/src/quick-lint-js/fe/parse-expression.cpp
@@ -3600,6 +3600,7 @@ Expression* Parser::parse_jsx_or_typescript_generic_expression(
 
       // <T | U>expr  // Type assertion.
       // <T[]>expr    // Type assertion.
+      case Token_Type::ampersand:
       case Token_Type::left_square:
       case Token_Type::pipe:
         this->lexer_.roll_back_transaction(std::move(transaction));
@@ -4110,6 +4111,7 @@ Expression* Parser::parse_typescript_angle_type_assertion_expression(
     // <T | U>expr
     // <T[]>expr
     // <ns.T>expr
+    case Token_Type::ampersand:
     case Token_Type::dot:
     case Token_Type::left_square:
     case Token_Type::pipe:

diff --git a/test/test-parse-typescript-angle-type-assertion.cpp b/test/test-parse-typescript-angle-type-assertion.cpp
@@ -88,6 +88,18 @@ TEST_F(Test_Parse_TypeScript_Angle_Type_Assertion, angle_type_assertion) {
                 ElementsAreArray({u8"Type1", u8"Type2", u8"expr"}));
   }
 
+  {
+    Spy_Visitor p = test_parse_and_visit_statement(
+        u8"<Type1 & Type2>(expr);"_sv, no_diags, typescript_options);
+    EXPECT_THAT(p.visits, ElementsAreArray({
+                              "visit_variable_type_use",  // Type1
+                              "visit_variable_type_use",  // Type2
+                              "visit_variable_use",       // expr
+                          }));
+    EXPECT_THAT(p.variable_uses,
+                ElementsAreArray({u8"Type1", u8"Type2", u8"expr"}));
+  }
+
   for (String8_View code : {
            u8"<Type>(expr);"_sv,
            u8"<(Type)>(expr);"_sv,