Correct name and value scopes and queries

Author: BlueDrink9

data/fixtures/scopes/r/name.assignment.scope

@@ -1,8 +1,7 @@
 hello = "world"
 ---
 
-[Content] =
-[Domain] = 0:0-0:5
+[Content] = 0:0-0:5
   >-----<
 0| hello = "world"
 
@@ -14,4 +13,8 @@ hello = "world"
        >---<
 0| hello = "world"
 
-[Insertion delimiter] = " = "
+[Domain] = 0:0-0:15
+  >---------------<
+0| hello = "world"
+
+[Insertion delimiter] = " "

data/fixtures/scopes/r/name.variable.scope

@@ -1,8 +1,7 @@
 hello <- "world"
 ---
 
-[Content] =
-[Domain] = 0:0-0:5
+[Content] = 0:0-0:5
   >-----<
 0| hello <- "world"
 
@@ -14,4 +13,8 @@ hello <- "world"
        >----<
 0| hello <- "world"
 
-[Insertion delimiter] = " <- "
+[Domain] = 0:0-0:16
+  >----------------<
+0| hello <- "world"
+
+[Insertion delimiter] = " "

data/fixtures/scopes/r/value.assignment.scope

@@ -1,8 +1,7 @@
 hello <- "world"
 ---
 
-[Content] =
-[Domain] = 0:9-0:16
+[Content] = 0:9-0:16
            >-------<
 0| hello <- "world"
 
@@ -14,4 +13,8 @@ hello <- "world"
        >----<
 0| hello <- "world"
 
-[Insertion delimiter] = " <- "
+[Domain] = 0:0-0:16
+  >----------------<
+0| hello <- "world"
+
+[Insertion delimiter] = " "

data/fixtures/scopes/r/value.variable.scope

@@ -1,8 +1,7 @@
 hello = "world"
 ---
 
-[Content] =
-[Domain] = 0:8-0:15
+[Content] = 0:8-0:15
           >-------<
 0| hello = "world"
 
@@ -14,4 +13,8 @@ hello = "world"
        >---<
 0| hello = "world"
 
+[Domain] = 0:0-0:15
+  >---------------<
+0| hello = "world"
+
 [Insertion delimiter] = " "

queries/r.scm

@@ -89,7 +89,6 @@
 )
 
 ;; Technically lists and arrays are just calls to the function `list` or `c`
-;; TODO: should this include the function name/brackets?
 ;;!! list(1, 2, 3)
 ;;!  ^^^^^^^^^^^^^
 (call
@@ -101,24 +100,23 @@
   ;;!! hello <- "world"
   ;;!  ^^^^^
   ;;!  -----
-  lhs: (identifier) @name
+  lhs: (identifier) @name @value.leading.endOf
   operator: "<-"
   ;;!! hello <- "world"
   ;;!           ^^^^^^^
   ;;!  -----
-  rhs: (_) @value
-)
+  rhs: (_) @value @name.trailing.startOf
+) @_.domain
 (binary_operator
   ;;!! hello <- "world"
   ;;!  ^^^^^
-  ;;!  -----
-  lhs: (identifier) @name
+  lhs: (identifier) @name @value.leading.endOf
   operator: "="
   ;;!! hello <- "world"
   ;;!           ^^^^^^^
   ;;!  -----
-  rhs: (_) @value
-)
+  rhs: (_) @value @name.trailing.startOf
+) @_.domain
 
 ;;!! foo(hello)
 ;;!      ^^^^^