scm scss

Author: AndreasArvidsson

data/fixtures/scopes/scm/argument.actual.multiLine.scope

@@ -5,36 +5,36 @@
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:7-0:11
-         >----<
-0| (#foo? @aaa bbb)
+[#1 Domain] = 1:4-1:8
+      >----<
+1|     @aaa
 
-[#1 Removal] = 0:7-0:12
-         >-----<
-0| (#foo? @aaa bbb)
+[#1 Removal] = 1:0-2:0
+  >--------
+1|     @aaa
+2|     bbb
+   <
 
-[#1 Leading delimiter] = 0:6-0:7
-        >-<
-0| (#foo? @aaa bbb)
+[#1 Leading delimiter] = 1:0-1:4
+  >----<
+1|     @aaa
 
-[#1 Trailing delimiter] = 0:11-0:12
-             >-<
-0| (#foo? @aaa bbb)
-
-[#1 Insertion delimiter] = " "
+[#1 Insertion delimiter] = "\n"
 
 
 [#2 Content] =
-[#2 Domain] = 0:12-0:15
-              >---<
-0| (#foo? @aaa bbb)
+[#2 Domain] = 2:4-2:7
+      >---<
+2|     bbb
 
-[#2 Removal] = 0:11-0:15
-             >----<
-0| (#foo? @aaa bbb)
+[#2 Removal] = 2:0-3:0
+  >-------
+2|     bbb
+3| )
+   <
 
-[#2 Leading delimiter] = 0:11-0:12
-             >-<
-0| (#foo? @aaa bbb)
+[#2 Leading delimiter] = 2:0-2:4
+  >----<
+2|     bbb
 
-[#2 Insertion delimiter] = " "
+[#2 Insertion delimiter] = "\n"

data/fixtures/scopes/scss/argument.actual.multiLine.scope

@@ -5,32 +5,40 @@
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:20-0:26
-                      >------<
-0| @mixin replace-text($image, $color: red) {}
+[#1 Domain] = 1:4-1:10
+      >------<
+1|     $image,
 
-[#1 Removal] = 0:20-0:28
-                      >--------<
-0| @mixin replace-text($image, $color: red) {}
+[#1 Removal] = 1:4-2:4
+      >-------
+1|     $image,
+2|     $color: red
+   ----<
 
-[#1 Trailing delimiter] = 0:26-0:28
-                            >--<
-0| @mixin replace-text($image, $color: red) {}
+[#1 Trailing delimiter] = 1:10-2:4
+            >-
+1|     $image,
+2|     $color: red
+   ----<
 
-[#1 Insertion delimiter] = ", "
+[#1 Insertion delimiter] = ",\n"
 
 
 [#2 Content] =
-[#2 Domain] = 0:28-0:39
-                              >-----------<
-0| @mixin replace-text($image, $color: red) {}
-
-[#2 Removal] = 0:26-0:39
-                            >-------------<
-0| @mixin replace-text($image, $color: red) {}
-
-[#2 Leading delimiter] = 0:26-0:28
-                            >--<
-0| @mixin replace-text($image, $color: red) {}
-
-[#2 Insertion delimiter] = ", "
+[#2 Domain] = 2:4-2:15
+      >-----------<
+2|     $color: red
+
+[#2 Removal] = 1:10-2:15
+            >-
+1|     $image,
+2|     $color: red
+   ---------------<
+
+[#2 Leading delimiter] = 1:10-2:4
+            >-
+1|     $image,
+2|     $color: red
+   ----<
+
+[#2 Insertion delimiter] = ",\n"

data/fixtures/scopes/scss/name.argument.formal.iteration.scope

@@ -7,10 +7,7 @@
 0| @mixin replace-text($image, $color: red) {}
 
 
-[#2 Range] = 0:20-0:39
+[#2 Range] =
+[#2 Domain] = 0:20-0:39
                       >-------------------<
 0| @mixin replace-text($image, $color: red) {}
-
-[#2 Domain] = 0:19-0:40
-                     >---------------------<
-0| @mixin replace-text($image, $color: red) {}

data/fixtures/scopes/scss/value.argument.formal.iteration.scope

@@ -7,10 +7,7 @@
 0| @mixin replace-text($image, $color: red) {}
 
 
-[#2 Range] = 0:20-0:39
+[#2 Range] =
+[#2 Domain] = 0:20-0:39
                       >-------------------<
 0| @mixin replace-text($image, $color: red) {}
-
-[#2 Domain] = 0:19-0:40
-                     >---------------------<
-0| @mixin replace-text($image, $color: red) {}

queries/scm.scm

@@ -40,7 +40,8 @@
 (predicate
   (parameters
     (_) @argumentOrParameter
-  )
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy " " "\n")
 )
 
 ;;!! (#aaa? @bbb "ccc")
@@ -49,7 +50,7 @@
   (predicate
     (parameters) @argumentList @argumentOrParameter.iteration
   ) @argumentList.domain @argumentOrParameter.iteration.domain
-  (#single-or-multi-line-delimiter! @argumentList @argumentList.domain " " "\n")
+  (#single-or-multi-line-delimiter! @argumentList @argumentList " " "\n")
 )
 
 ;;!! (aaa) @bbb

queries/scss.scm

@@ -97,8 +97,8 @@
     (_) @argumentOrParameter
     .
     (_)? @_.trailing.startOf
-  )
-  (#insertion-delimiter! @argumentOrParameter ", ")
+  ) @_dummy
+  (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
 (_
@@ -111,7 +111,7 @@
 (parameters
   "(" @name.iteration.start.endOf @value.iteration.start.endOf
   ")" @name.iteration.end.startOf @value.iteration.end.startOf
-) @name.iteration.domain @value.iteration.domain
+)
 
 ;;!! foo($foo: 123)
 ;;!      ^^^^  ^^^