Class type

AndreasArvidsson · AndreasArvidsson · commit caff249069b8 · 2025-04-20T11:16:54.000+02:00
diff --git a/data/fixtures/scopes/javascript.core/class.scope b/data/fixtures/scopes/javascript.core/class.scope
@@ -1,15 +1,10 @@
-class MyClass {
-
-}
+class MyClass { }
 ---
 
 [Content] =
 [Removal] =
-[Domain] = 0:0-2:1
-  >---------------
-0| class MyClass {
-1|
-2| }
-   -<
+[Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
 
 [Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/javascript.core/class2.scope b/data/fixtures/scopes/javascript.core/class2.scope
@@ -0,0 +1,10 @@
+export default class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:32
+  >--------------------------------<
+0| export default class MyClass { }
+
+[Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/javascript.core/class3.scope b/data/fixtures/scopes/javascript.core/class3.scope
@@ -0,0 +1,10 @@
+export class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:24
+  >------------------------<
+0| export class MyClass { }
+
+[Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/javascript.core/type.class.scope b/data/fixtures/scopes/javascript.core/type.class.scope
@@ -0,0 +1,10 @@
+class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/class.scope b/data/fixtures/scopes/typescript.core/class.scope
@@ -0,0 +1,10 @@
+abstract class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:26
+  >--------------------------<
+0| abstract class MyClass { }
+
+[Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/typescript.core/class2.scope b/data/fixtures/scopes/typescript.core/class2.scope
@@ -0,0 +1,10 @@
+export default abstract class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:41
+  >-----------------------------------------<
+0| export default abstract class MyClass { }
+
+[Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/typescript.core/class3.scope b/data/fixtures/scopes/typescript.core/class3.scope
@@ -0,0 +1,10 @@
+export abstract class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:33
+  >---------------------------------<
+0| export abstract class MyClass { }
+
+[Insertion delimiter] = "\n\n"
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.constructor.scope b/data/fixtures/scopes/typescript.core/type.argument.formal.constructor.scope
@@ -3,20 +3,32 @@ class MyClass {
 }
 ---
 
-[Content] = 1:21-1:27
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:0-2:1
+  >---------------
+0| class MyClass {
+1|   constructor(value: number) { }
+2| }
+   -<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 1:21-1:27
                        >------<
 1|   constructor(value: number) { }
 
-[Removal] = 1:19-1:27
+[#2 Removal] = 1:19-1:27
                      >--------<
 1|   constructor(value: number) { }
 
-[Leading delimiter] = 1:19-1:21
+[#2 Leading delimiter] = 1:19-1:21
                      >--<
 1|   constructor(value: number) { }
 
-[Domain] = 1:14-1:27
+[#2 Domain] = 1:14-1:27
                 >-------------<
 1|   constructor(value: number) { }
 
-[Insertion delimiter] = " "
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.method.scope b/data/fixtures/scopes/typescript.core/type.argument.formal.method.scope
@@ -3,20 +3,32 @@ class MyClass {
 }
 ---
 
-[Content] = 1:16-1:22
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:0-2:1
+  >---------------
+0| class MyClass {
+1|   myFunk(value: number) { }
+2| }
+   -<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 1:16-1:22
                   >------<
 1|   myFunk(value: number) { }
 
-[Removal] = 1:14-1:22
+[#2 Removal] = 1:14-1:22
                 >--------<
 1|   myFunk(value: number) { }
 
-[Leading delimiter] = 1:14-1:16
+[#2 Leading delimiter] = 1:14-1:16
                 >--<
 1|   myFunk(value: number) { }
 
-[Domain] = 1:9-1:22
+[#2 Domain] = 1:9-1:22
            >-------------<
 1|   myFunk(value: number) { }
 
-[Insertion delimiter] = " "
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/type.class.scope b/data/fixtures/scopes/typescript.core/type.class.scope
@@ -0,0 +1,10 @@
+abstract class MyClass { }
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:26
+  >--------------------------<
+0| abstract class MyClass { }
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/typescript.core/type.field.scope b/data/fixtures/scopes/typescript.core/type.field.scope
@@ -7,96 +7,112 @@ class Aaa {
 }
 ---
 
-[#1 Content] = 1:10-1:16
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:0-6:1
+  >-----------
+0| class Aaa {
+1|     bbb!: string = undefined;
+2|     ccc: string = undefined;
+3|     private eee!: string = undefined;
+4|     eee: string;
+5|     fff!: string;
+6| }
+   -<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 1:10-1:16
             >------<
 1|     bbb!: string = undefined;
 
-[#1 Removal] = 1:7-1:16
+[#2 Removal] = 1:7-1:16
          >---------<
 1|     bbb!: string = undefined;
 
-[#1 Leading delimiter] = 1:7-1:10
+[#2 Leading delimiter] = 1:7-1:10
          >---<
 1|     bbb!: string = undefined;
 
-[#1 Domain] = 1:4-1:29
+[#2 Domain] = 1:4-1:29
       >-------------------------<
 1|     bbb!: string = undefined;
 
-[#1 Insertion delimiter] = " "
+[#2 Insertion delimiter] = " "
 
 
-[#2 Content] = 2:9-2:15
+[#3 Content] = 2:9-2:15
            >------<
 2|     ccc: string = undefined;
 
-[#2 Removal] = 2:7-2:15
+[#3 Removal] = 2:7-2:15
          >--------<
 2|     ccc: string = undefined;
 
-[#2 Leading delimiter] = 2:7-2:9
+[#3 Leading delimiter] = 2:7-2:9
          >--<
 2|     ccc: string = undefined;
 
-[#2 Domain] = 2:4-2:28
+[#3 Domain] = 2:4-2:28
       >------------------------<
 2|     ccc: string = undefined;
 
-[#2 Insertion delimiter] = " "
+[#3 Insertion delimiter] = " "
 
 
-[#3 Content] = 3:18-3:24
+[#4 Content] = 3:18-3:24
                     >------<
 3|     private eee!: string = undefined;
 
-[#3 Removal] = 3:15-3:24
+[#4 Removal] = 3:15-3:24
                  >---------<
 3|     private eee!: string = undefined;
 
-[#3 Leading delimiter] = 3:15-3:18
+[#4 Leading delimiter] = 3:15-3:18
                  >---<
 3|     private eee!: string = undefined;
 
-[#3 Domain] = 3:4-3:37
+[#4 Domain] = 3:4-3:37
       >---------------------------------<
 3|     private eee!: string = undefined;
 
-[#3 Insertion delimiter] = " "
+[#4 Insertion delimiter] = " "
 
 
-[#4 Content] = 4:9-4:15
+[#5 Content] = 4:9-4:15
            >------<
 4|     eee: string;
 
-[#4 Removal] = 4:7-4:15
+[#5 Removal] = 4:7-4:15
          >--------<
 4|     eee: string;
 
-[#4 Leading delimiter] = 4:7-4:9
+[#5 Leading delimiter] = 4:7-4:9
          >--<
 4|     eee: string;
 
-[#4 Domain] = 4:4-4:16
+[#5 Domain] = 4:4-4:16
       >------------<
 4|     eee: string;
 
-[#4 Insertion delimiter] = " "
+[#5 Insertion delimiter] = " "
 
 
-[#5 Content] = 5:10-5:16
+[#6 Content] = 5:10-5:16
             >------<
 5|     fff!: string;
 
-[#5 Removal] = 5:7-5:16
+[#6 Removal] = 5:7-5:16
          >---------<
 5|     fff!: string;
 
-[#5 Leading delimiter] = 5:7-5:10
+[#6 Leading delimiter] = 5:7-5:10
          >---<
 5|     fff!: string;
 
-[#5 Domain] = 5:4-5:17
+[#6 Domain] = 5:4-5:17
       >-------------<
 5|     fff!: string;
 
-[#5 Insertion delimiter] = " "
+[#6 Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -130,6 +130,8 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "value.field": supported,
   "value.yield": supported,
 
+  "type.class": supported,
+
   // Unsupported
 
   "interior.class": unsupported,
@@ -193,7 +195,6 @@ export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
   "type.argument.formal.method": notApplicable,
   "type.argument.formal": notApplicable,
   "type.cast": notApplicable,
-  "type.class": notApplicable,
   "type.enum": notApplicable,
   "type.field.iteration": notApplicable,
   "type.field": notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/typescript.ts b/packages/common/src/scopeSupportFacets/typescript.ts
@@ -25,9 +25,7 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
 
   // Unsupported
 
-  "type.class": unsupported,
   "type.field.iteration": unsupported,
-  "type.foreach": unsupported,
   "type.typeArgument": unsupported,
   "type.typeArgument.iteration": unsupported,
 
@@ -40,5 +38,6 @@ export const typescriptScopeSupport: LanguageScopeSupportFacetMap = {
   attribute: notApplicable,
   "key.attribute": notApplicable,
   "value.attribute": notApplicable,
+  "type.foreach": notApplicable,
   "interior.element": notApplicable,
 };
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
@@ -551,7 +551,7 @@
     (class
       name: (_) @className
     )
-  ] @class @_.domain
+  ] @class @type @_.domain
   (#not-parent-type? @class export_statement)
 )
 
@@ -566,7 +566,7 @@
       name: (_) @className
     )
   ]
-) @class @_.domain
+) @class @type @_.domain
 
 (program) @class.iteration @className.iteration
 
diff --git a/queries/typescript.core.scm b/queries/typescript.core.scm
@@ -335,7 +335,7 @@
 (
   (abstract_class_declaration
     name: (_) @className
-  ) @class @_.domain
+  ) @class @type @_.domain
   (#not-parent-type? @class export_statement)
 )
 
@@ -345,7 +345,7 @@
   (abstract_class_declaration
     name: (_) @className
   )
-) @class @_.domain
+) @class @type @_.domain
 
 ;;!! class MyClass {}
 ;;!        ^^^^^^^
