python

Author: AndreasArvidsson

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

@@ -7,7 +7,13 @@ class Foo:
         pass
 ---
 
-[Content] =
+[Content] = 2:8-4:16
+          >-----
+2|         self,
+3|         aaa: str,
+4|         bbb: int
+   ----------------<
+
 [Removal] = 1:17-5:4
                    >
 1|     def __init__(
@@ -17,6 +23,10 @@ class Foo:
 5|     ):
    ----<
 
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         self,
+
 [Domain] = 1:4-6:12
       >-------------
 1|     def __init__(

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

@@ -6,7 +6,12 @@ class Foo:
         pass
 ---
 
-[Content] =
+[Content] = 2:8-3:16
+          >---------
+2|         aaa: str,
+3|         bbb: int
+   ----------------<
+
 [Removal] = 1:12-4:4
               >
 1|     def bar(
@@ -15,6 +20,10 @@ class Foo:
 4|     ):
    ----<
 
+[Leading delimiter] = 2:0-2:8
+  >--------<
+2|         aaa: str,
+
 [Domain] = 1:4-5:12
       >--------
 1|     def bar(

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

@@ -5,7 +5,12 @@ def foo(
     pass
 ---
 
-[Content] =
+[Content] = 1:4-2:13
+      >---------
+1|     aaa: str,
+2|     bbb: int,
+   -------------<
+
 [Removal] = 0:8-3:0
           >
 0| def foo(
@@ -14,6 +19,10 @@ def foo(
 3| ):
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa: str,
+
 [Domain] = 0:0-4:8
   >--------
 0| def foo(

queries/python.scm

@@ -646,8 +646,8 @@
 
 (pattern_list) @collectionItem.iteration
 
-;;!! def foo(name) {}
-;;!          ^^^^
+;;!! def foo(aaa, bbb) {}
+;;!          ^^^  ^^^
 (_
   parameters: (_
     (_)? @_.leading.endOf
@@ -662,8 +662,8 @@
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
-;;!! foo("bar")
-;;!      ^^^^^
+;;!! foo(aaa, bbb)
+;;!      ^^^  ^^^
 (
   (argument_list
     (_)? @_.leading.endOf
@@ -703,30 +703,34 @@
   (#insertion-delimiter! @argumentList.start.endOf " ")
 ) @argumentList.domain
 
-;;!! def (a, b): pass
-;;!       ^^^^
+;;!! def foo(aaa, bbb): pass
+;;!          ^^^^^^^^
 (_
   (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)
+;;!       ^^^^^^^^
 (_
   (argument_list
-    "(" @argumentOrParameter.iteration.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf
-    ")" @argumentOrParameter.iteration.end.startOf @name.iteration.end.startOf @value.iteration.end.startOf
-  ) @name.iteration.domain @value.iteration.domain
-) @argumentOrParameter.iteration.domain
+    "(" @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
 
-(_
-  (argument_list
-    "(" @argumentList.start.endOf
-    ")" @argumentList.end.startOf
-  ) @_dummy
-  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
-) @argumentList.domain
+;;!! foo (aaa=1, bbb=2)
+;;!       ^^^^^^^^^^^^
+(argument_list
+  "(" @name.iteration.start.endOf @value.iteration.start.endOf
+  ")" @name.iteration.end.startOf @value.iteration.end.startOf
+) @name.iteration.domain @value.iteration.domain
 
 (call
   (generator_expression