java

Author: AndreasArvidsson

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

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

data/fixtures/scopes/java/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:8
   >-
 0| (

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

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

queries/java.scm

@@ -519,10 +519,11 @@
 ;;!           ^^^^^^^^^^^^^^^^
 (_
   parameters: (_
-    "(" @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
 
 ;;!! foo(aaa, bbb);