csharp

Author: AndreasArvidsson

data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope

@@ -4,7 +4,12 @@ new Foo(
 );
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:8-3:0
           >
 0| new Foo(
@@ -13,6 +18,10 @@ new Foo(
 3| );
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:1
   >--------
 0| new Foo(

data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope

@@ -4,7 +4,12 @@ foo.bar(
 );
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:8-3:0
           >
 0| foo.bar(
@@ -13,6 +18,10 @@ foo.bar(
 3| );
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:1
   >--------
 0| foo.bar(

data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope

@@ -4,7 +4,12 @@ foo(
 );
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:4-3:0
       >
 0| foo(
@@ -13,6 +18,10 @@ foo(
 3| );
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:1
   >----
 0| foo(

data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope

@@ -6,7 +6,12 @@ class MyClass {
 }
 ---
 
-[Content] =
+[Content] = 2:8-3:15
+          >--------
+2|         int aaa,
+3|         int bbb
+   ---------------<
+
 [Removal] = 1:12-4:4
               >
 1|     MyClass(
@@ -15,6 +20,10 @@ class MyClass {
 4|     ) {}
    ----<
 
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         int aaa,
+
 [Domain] = 1:4-4:8
       >--------
 1|     MyClass(

data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope

@@ -4,7 +4,12 @@
 ) => {};
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:1-3:0
    >
 0| (
@@ -13,6 +18,10 @@
 3| ) => {};
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:7
   >-
 0| (

data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope

@@ -6,7 +6,12 @@ class MyClass {
 }
 ---
 
-[Content] =
+[Content] = 2:8-3:15
+          >--------
+2|         int aaa,
+3|         int bbb
+   ---------------<
+
 [Removal] = 1:13-4:4
                >
 1|     void foo(
@@ -15,6 +20,10 @@ class MyClass {
 4|     ) {}
    ----<
 
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         int aaa,
+
 [Domain] = 1:4-4:8
       >---------
 1|     void foo(

data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope

@@ -4,7 +4,12 @@ void foo(
 ) {}
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:9-3:0
            >
 0| void foo(
@@ -13,6 +18,10 @@ void foo(
 3| ) {}
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:4
   >---------
 0| void foo(

queries/csharp.scm

@@ -401,7 +401,7 @@
   ">" @type.iteration.end.startOf
 )
 
-;;!! int value = 5
+;;!! int value = 0;
 ;;!              ^
 (parameter
   name: (_) @value.leading.endOf
@@ -410,8 +410,8 @@
   )
 ) @_.domain
 
-;; !! foo(a, b)
-;; !      ^  ^
+;; !! foo(aaa, bbb)
+;; !      ^^^  ^^^
 (
   (argument_list
     (_)? @_.leading.endOf
@@ -424,14 +424,15 @@
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
-;; !! foo(a, b)
-;; !      ^^^^
+;; !! foo(aaa, bbb)
+;; !      ^^^^^^^^
 (_
   (argument_list
-    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
-  ) @_dummy
-  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+    "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
+    ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @argumentList
+  (#child-range! @argumentList 1 -2)
+  (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;; !! void foo(int a, int b)
@@ -452,10 +453,11 @@
 ;; !           ^^^^^^^^^^^^
 (_
   (parameter_list
-    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
-  ) @_dummy
-  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+    "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
+    ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @argumentList
+  (#child-range! @argumentList 1 -2)
+  (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 (parameter_list
@@ -465,7 +467,7 @@
 
 ;; Treat interior of all bodies as iteration scopes for `name`, eg
 ;;!! void foo() {   }
-;;!              ***
+;;!              ^^^
 (_
   body: (_
     "{" @name.iteration.start.endOf @value.iteration.start.endOf @type.iteration.start.endOf