Type arguments

Author: AndreasArvidsson

data/fixtures/scopes/typescript.core/type.typeArgument.iteration.scope

@@ -0,0 +1,13 @@
+let value: Map<string, number>;
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:31
+  >-------------------------------<
+0| let value: Map<string, number>;
+
+
+[#2 Range] =
+[#2 Domain] = 0:15-0:29
+                 >--------------<
+0| let value: Map<string, number>;

data/fixtures/scopes/typescript.core/type.typeArgument.scope

@@ -0,0 +1,45 @@
+let value: Map<string, number>;
+---
+
+[#1 Content] = 0:11-0:30
+             >-------------------<
+0| let value: Map<string, number>;
+
+[#1 Removal] = 0:9-0:30
+           >---------------------<
+0| let value: Map<string, number>;
+
+[#1 Leading delimiter] = 0:10-0:11
+            >-<
+0| let value: Map<string, number>;
+
+[#1 Domain] = 0:0-0:31
+  >-------------------------------<
+0| let value: Map<string, number>;
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 0:15-0:21
+                 >------<
+0| let value: Map<string, number>;
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Domain] = 0:23-0:29
+                         >------<
+0| let value: Map<string, number>;
+
+[#3 Removal] = 0:22-0:29
+                        >-------<
+0| let value: Map<string, number>;
+
+[#3 Leading delimiter] = 0:22-0:23
+                        >-<
+0| let value: Map<string, number>;
+
+[#3 Insertion delimiter] = " "

data/fixtures/scopes/typescript/type.cast.scope

@@ -1,16 +1,25 @@
 <Aaa>bbb
 ---
 
-[Content] = 0:1-0:4
+[#1 Content] = 0:1-0:4
    >---<
 0| <Aaa>bbb
 
-[Removal] = 0:0-0:5
+[#1 Removal] = 0:0-0:5
   >-----<
 0| <Aaa>bbb
 
-[Domain] = 0:0-0:8
+[#1 Domain] = 0:0-0:8
   >--------<
 0| <Aaa>bbb
 
-[Insertion delimiter] = " "
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 0:1-0:4
+   >---<
+0| <Aaa>bbb
+
+[#2 Insertion delimiter] = " "

packages/common/src/scopeSupportFacets/typescript.ts

@@ -2,7 +2,7 @@ import { javascriptCoreScopeSupport } from "./javascript";
 import type { LanguageScopeSupportFacetMap } from "./scopeSupportFacets.types";
 import { ScopeSupportFacetLevel } from "./scopeSupportFacets.types";
 
-const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
+const { supported, notApplicable } = ScopeSupportFacetLevel;
 
 export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   ...javascriptCoreScopeSupport,
@@ -21,14 +21,11 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.enum": supported,
   "type.return": supported,
   "type.variable": supported,
+  "type.typeArgument": supported,
+  "type.typeArgument.iteration": supported,
 
   "value.typeAlias": supported,
 
-  // Unsupported
-
-  "type.typeArgument": unsupported,
-  "type.typeArgument.iteration": unsupported,
-
   // Not applicable
 
   element: notApplicable,

queries/java.scm

@@ -495,6 +495,7 @@
   ">" @type.iteration.end.startOf
   .
 )
+
 ;;!! foo(name: string) {}
 ;;!      ^^^^^^^^^^^^
 (

queries/typescript.core.scm

@@ -406,9 +406,26 @@
   "=>" @disqualifyDelimiter
 )
 
+;;!! class Aaa { }
+;;!             ^
 (class_body
   .
   "{" @type.iteration.start.endOf
   "}" @type.iteration.end.startOf
   .
 )
+
+;;!! Map<string, number>
+;;!      ^^^^^^  ^^^^^^
+(type_arguments
+  (_) @type
+)
+
+;;!! Map<string, number>
+;;!      ^^^^^^^^^^^^^^
+(type_arguments
+  .
+  "<" @type.iteration.start.endOf
+  ">" @type.iteration.end.startOf
+  .
+)