Update to latest core syntaxes.

Thom1729 · Apr 30, 2022 · a2a94ed · a2a94ed
1 parent 500d259
commit a2a94ed
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/extensions/typescript.syntax-extension b/extensions/typescript.syntax-extension
@@ -530,19 +530,22 @@ contexts:
     - match: \<(?!<)
       scope: punctuation.definition.generic.begin.js
       set:
-        - - meta_scope: meta.generic.js
-          - match: \>
-            scope: punctuation.definition.generic.end.js
-            pop: true
+        - ts-type-parameter-list-tail
+        - ts-type-parameter-list-head
+    - include: else-pop
 
-          - match: ','
-            scope: punctuation.separator.comma
-            push: ts-type-parameter-list-item
-          - include: else-pop
-        - ts-type-parameter-list-item
+  ts-type-parameter-list-tail:
+    - meta_scope: meta.generic.js
+    - match: \>
+      scope: punctuation.definition.generic.end.js
+      pop: true
+
+    - match: ','
+      scope: punctuation.separator.comma
+      push: ts-type-parameter-list-head
     - include: else-pop
 
-  ts-type-parameter-list-item:
+  ts-type-parameter-list-head:
     - match: '{{identifier_name}}'
       scope: variable.parameter.generic.js
       set:

diff --git a/tests/syntax_test_suites/tsx/tsx.tsx b/tests/syntax_test_suites/tsx/tsx.tsx
@@ -217,6 +217,7 @@ if (a < b || c <= d) {}
 //     ^^^^^^^ entity.other.attribute-name
 //            ^ punctuation.separator.key-value
 //             ^^^ string.quoted.double
+//                 ^^^^^^^^^ - meta.function
 //                       ^^^ meta.interpolation
 //                               ^^^^ meta.tag
 //                                 ^ meta.tag.name entity.name.tag

diff --git a/tests/syntax_test_suites/typescript/typescript.ts b/tests/syntax_test_suites/typescript/typescript.ts
@@ -1229,21 +1229,6 @@ const x = {
 //           ^^^ variable.other.readwrite
 };
 
-    <any>(<any>a);
-//  ^^^^^ meta.assertion
-//  ^ punctuation.definition.assertion.begin
-//   ^^^ support.type.any
-//      ^ punctuation.definition.assertion.end
-//       ^^^^^^^^ meta.group
-//       ^ punctuation.section.group.begin
-//        ^^^^^ meta.assertion
-//        ^ punctuation.definition.assertion.begin
-//         ^^^ support.type.any
-//            ^ punctuation.definition.assertion.end
-//             ^ variable.other.readwrite
-//              ^ punctuation.section.group.end
-//               ^ punctuation.terminator.statement
-
     true ? (a) : <T,foo="a">() => {} => {} : null; // </T>;
 //  ^^^^ constant.language.boolean.true
 //       ^ keyword.operator.ternary

diff --git a/tests/syntax_test_suites/typescript/typescript_not_tsx.ts b/tests/syntax_test_suites/typescript/typescript_not_tsx.ts
@@ -34,3 +34,18 @@ let strLength: number = (<string>someValue).length; // </string>
 //    ^ punctuation.definition.generic.end
 //     ^^ meta.function.parameters
 //        ^^ keyword.declaration.function.arrow
+
+    <any>(<any>a);
+//  ^^^^^ meta.assertion
+//  ^ punctuation.definition.assertion.begin
+//   ^^^ support.type.any
+//      ^ punctuation.definition.assertion.end
+//       ^^^^^^^^ meta.group
+//       ^ punctuation.section.group.begin
+//        ^^^^^ meta.assertion
+//        ^ punctuation.definition.assertion.begin
+//         ^^^ support.type.any
+//            ^ punctuation.definition.assertion.end
+//             ^ variable.other.readwrite
+//              ^ punctuation.section.group.end
+//               ^ punctuation.terminator.statement