java2

Author: AndreasArvidsson

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

queries/java.scm

@@ -530,10 +530,11 @@
 ;;!      ^^^^^^^^
 (_
   (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
 
 ;;!! try (PrintWriter writer = create()) { }