js

Author: AndreasArvidsson

data/fixtures/scopes/javascript.core/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/javascript.core/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/javascript.core/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/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope

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

data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope

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

data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope

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

data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope

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

data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope

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

queries/javascript.core.scm

@@ -751,8 +751,8 @@
   "}" @statement.iteration.end.startOf
 )
 
-;;!! foo(name) {}
-;;!      ^^^^
+;;!! function foo(aaa, bbb) {}
+;;!               ^^^  ^^^
 (
   (formal_parameters
     (_)? @_.leading.endOf
@@ -765,8 +765,8 @@
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
-;;!! foo("bar")
-;;!      ^^^^^
+;;!! foo(aaa, bbb)
+;;!      ^^^  ^^^
 (
   (arguments
     (_)? @_.leading.endOf
@@ -779,25 +779,31 @@
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
+;;!! function foo(aaa, bbb) {}
+;;!               ^^^^^^^^
 (_
   (formal_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
 
 (formal_parameters
   "(" @name.iteration.start.endOf @value.iteration.start.endOf @type.iteration.start.endOf
   ")" @name.iteration.end.startOf @value.iteration.end.startOf @type.iteration.end.startOf
 )
 
+;;!! foo(aaa, bbb)
+;;!      ^^^^^^^^
 (_
   (arguments
-    "(" @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
 
 operator: [