Added argument list scope

AndreasArvidsson · AndreasArvidsson · commit 5e28db14237c · 2025-05-29T10:38:48.000+02:00
diff --git a/data/fixtures/scopes/csharp/argument.actual.iteration.scope b/data/fixtures/scopes/csharp/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ Foo(5, "bar");
       >--------<
 0| Foo(5, "bar");
 
-[Domain] = 0:3-0:13
-     >----------<
+[Domain] = 0:0-0:13
+  >-------------<
 0| Foo(5, "bar");
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor.scope b/data/fixtures/scopes/csharp/argumentList.actual.constructor.scope
@@ -0,0 +1,13 @@
+new Foo();
+---
+
+[Content] =
+[Removal] = 0:8-0:8
+          ><
+0| new Foo();
+
+[Domain] = 0:0-0:9
+  >---------<
+0| new Foo();
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor2.scope b/data/fixtures/scopes/csharp/argumentList.actual.constructor2.scope
@@ -0,0 +1,13 @@
+new Foo(a, b);
+---
+
+[Content] =
+[Removal] = 0:8-0:12
+          >----<
+0| new Foo(a, b);
+
+[Domain] = 0:0-0:13
+  >-------------<
+0| new Foo(a, b);
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor3.scope b/data/fixtures/scopes/csharp/argumentList.actual.constructor3.scope
@@ -0,0 +1,24 @@
+new Foo(
+    a,
+    b
+);
+---
+
+[Content] =
+[Removal] = 0:8-3:0
+          >
+0| new Foo(
+1|     a,
+2|     b
+3| );
+   <
+
+[Domain] = 0:0-3:1
+  >--------
+0| new Foo(
+1|     a,
+2|     b
+3| );
+   -<
+
+[Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method.scope b/data/fixtures/scopes/csharp/argumentList.actual.method.scope
@@ -0,0 +1,13 @@
+foo.bar();
+---
+
+[Content] =
+[Removal] = 0:8-0:8
+          ><
+0| foo.bar();
+
+[Domain] = 0:0-0:9
+  >---------<
+0| foo.bar();
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method2.scope b/data/fixtures/scopes/csharp/argumentList.actual.method2.scope
@@ -0,0 +1,13 @@
+foo.bar(a, b);
+---
+
+[Content] =
+[Removal] = 0:8-0:12
+          >----<
+0| foo.bar(a, b);
+
+[Domain] = 0:0-0:13
+  >-------------<
+0| foo.bar(a, b);
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method3.scope b/data/fixtures/scopes/csharp/argumentList.actual.method3.scope
@@ -0,0 +1,24 @@
+foo.bar(
+    a,
+    b
+);
+---
+
+[Content] =
+[Removal] = 0:8-3:0
+          >
+0| foo.bar(
+1|     a,
+2|     b
+3| );
+   <
+
+[Domain] = 0:0-3:1
+  >--------
+0| foo.bar(
+1|     a,
+2|     b
+3| );
+   -<
+
+[Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/csharp/argumentList.actual.scope b/data/fixtures/scopes/csharp/argumentList.actual.scope
@@ -0,0 +1,13 @@
+foo();
+---
+
+[Content] =
+[Removal] = 0:4-0:4
+      ><
+0| foo();
+
+[Domain] = 0:0-0:5
+  >-----<
+0| foo();
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.actual2.scope b/data/fixtures/scopes/csharp/argumentList.actual2.scope
@@ -0,0 +1,13 @@
+foo(a, b);
+---
+
+[Content] =
+[Removal] = 0:4-0:8
+      >----<
+0| foo(a, b);
+
+[Domain] = 0:0-0:9
+  >---------<
+0| foo(a, b);
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.actual3.scope b/data/fixtures/scopes/csharp/argumentList.actual3.scope
@@ -0,0 +1,24 @@
+foo(
+    a,
+    b
+);
+---
+
+[Content] =
+[Removal] = 0:4-3:0
+      >
+0| foo(
+1|     a,
+2|     b
+3| );
+   <
+
+[Domain] = 0:0-3:1
+  >----
+0| foo(
+1|     a,
+2|     b
+3| );
+   -<
+
+[Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.constructor.scope b/data/fixtures/scopes/csharp/argumentList.formal.constructor.scope
@@ -0,0 +1,15 @@
+class MyClass {
+    MyClass() {}
+}
+---
+
+[Content] =
+[Removal] = 1:12-1:12
+              ><
+1|     MyClass() {}
+
+[Domain] = 1:4-1:16
+      >------------<
+1|     MyClass() {}
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.constructor2.scope b/data/fixtures/scopes/csharp/argumentList.formal.constructor2.scope
@@ -0,0 +1,15 @@
+class MyClass {
+    MyClass(int a, int b) {}
+}
+---
+
+[Content] =
+[Removal] = 1:12-1:24
+              >------------<
+1|     MyClass(int a, int b) {}
+
+[Domain] = 1:4-1:28
+      >------------------------<
+1|     MyClass(int a, int b) {}
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.lambda.scope b/data/fixtures/scopes/csharp/argumentList.formal.lambda.scope
@@ -0,0 +1,13 @@
+() => {};
+---
+
+[Content] =
+[Removal] = 0:1-0:1
+   ><
+0| () => {};
+
+[Domain] = 0:0-0:8
+  >--------<
+0| () => {};
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.lambda2.scope b/data/fixtures/scopes/csharp/argumentList.formal.lambda2.scope
@@ -0,0 +1,13 @@
+(a, b) => {};
+---
+
+[Content] =
+[Removal] = 0:1-0:5
+   >----<
+0| (a, b) => {};
+
+[Domain] = 0:0-0:12
+  >------------<
+0| (a, b) => {};
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.method.scope b/data/fixtures/scopes/csharp/argumentList.formal.method.scope
@@ -0,0 +1,15 @@
+class MyClass {
+    void foo() {}
+}
+---
+
+[Content] =
+[Removal] = 1:13-1:13
+               ><
+1|     void foo() {}
+
+[Domain] = 1:4-1:17
+      >-------------<
+1|     void foo() {}
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.method2.scope b/data/fixtures/scopes/csharp/argumentList.formal.method2.scope
@@ -0,0 +1,15 @@
+class MyClass {
+    void foo(int a, int b) {}
+}
+---
+
+[Content] =
+[Removal] = 1:13-1:25
+               >------------<
+1|     void foo(int a, int b) {}
+
+[Domain] = 1:4-1:29
+      >-------------------------<
+1|     void foo(int a, int b) {}
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.formal.scope b/data/fixtures/scopes/csharp/argumentList.formal.scope
@@ -0,0 +1,13 @@
+void foo() {}
+---
+
+[Content] =
+[Removal] = 0:9-0:9
+           ><
+0| void foo() {}
+
+[Domain] = 0:0-0:13
+  >-------------<
+0| void foo() {}
+
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/csharp/argumentList.formal2.scope b/data/fixtures/scopes/csharp/argumentList.formal2.scope
@@ -0,0 +1,13 @@
+void foo(a, b) {}
+---
+
+[Content] =
+[Removal] = 0:9-0:13
+           >----<
+0| void foo(a, b) {}
+
+[Domain] = 0:0-0:17
+  >-----------------<
+0| void foo(a, b) {}
+
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/csharp/argumentList.formal3.scope b/data/fixtures/scopes/csharp/argumentList.formal3.scope
@@ -0,0 +1,24 @@
+void foo(
+    a,
+    b
+) {}
+---
+
+[Content] =
+[Removal] = 0:9-3:0
+           >
+0| void foo(
+1|     a,
+2|     b
+3| ) {}
+   <
+
+[Domain] = 0:0-3:4
+  >---------
+0| void foo(
+1|     a,
+2|     b
+3| ) {}
+   ----<
+
+[Insertion delimiter] = ",\n"
diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts
@@ -62,6 +62,14 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = {
   "key.mapPair": supported,
   "key.mapPair.iteration": supported,
 
+  "argumentList.actual": supported,
+  "argumentList.actual.constructor": supported,
+  "argumentList.actual.method": supported,
+  "argumentList.formal": supported,
+  "argumentList.formal.lambda": supported,
+  "argumentList.formal.constructor": supported,
+  "argumentList.formal.method": supported,
+
   "argument.actual": supported,
   "argument.actual.iteration": supported,
   "argument.formal": supported,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -282,6 +282,18 @@ export const scopeSupportFacetInfos: Record<
     isIteration: true,
   },
 
+  "argumentList.actual": {
+    description: "A list of arguments in a function call",
+    scopeType: "argumentList",
+  },
+  "argumentList.actual.method": {
+    description: "A list of arguments in a class method call",
+    scopeType: "argumentList",
+  },
+  "argumentList.actual.constructor": {
+    description: "A list of arguments in a constructor call",
+    scopeType: "argumentList",
+  },
   "argumentList.formal": {
     description: "A list of parameters in a function declaration",
     scopeType: "argumentList",
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -72,6 +72,9 @@ export const scopeSupportFacets = [
   "argument.formal.lambda",
   "argument.formal.lambda.iteration",
 
+  "argumentList.actual",
+  "argumentList.actual.method",
+  "argumentList.actual.constructor",
   "argumentList.formal",
   "argumentList.formal.method",
   "argumentList.formal.constructor",
diff --git a/queries/cpp.scm b/queries/cpp.scm
@@ -43,6 +43,8 @@
 ) @_.domain
 
 (lambda_expression) @anonymousFunction
+
+;;!! [[attribute]]
 (attribute_declaration) @attribute
 
 ;; >  curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-cpp/master/src/node-types.json | jq '[.[] | select(.type == "_type_specifier") | .subtypes[].type]'
diff --git a/queries/csharp.scm b/queries/csharp.scm
