Fix name chucking to match typescript logic

Author: fidgetingbits

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/lua/chuckName.yml

@@ -11,13 +11,15 @@ command:
           scopeType: {type: name}
   usePrePhraseSnapshot: true
 initialState:
-  documentContents: local a = 42
+  documentContents: |
+    local a = 42
   selections:
-    - anchor: {line: 0, character: 12}
-      active: {line: 0, character: 12}
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
   marks: {}
 finalState:
-  documentContents: local = 42
+  documentContents: |
+    42
   selections:
-    - anchor: {line: 0, character: 10}
-      active: {line: 0, character: 10}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/lua/chuckName2.yml

@@ -0,0 +1,25 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck name
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    a = 42
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}
+  marks: {}
+finalState:
+  documentContents: |
+    42
+  selections:
+    - anchor: {line: 0, character: 2}
+      active: {line: 0, character: 2}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/lua/chuckName3.yml

@@ -0,0 +1,23 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck name
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: local a,b = "Hello", "World"
+  selections:
+    - anchor: {line: 0, character: 28}
+      active: {line: 0, character: 28}
+  marks: {}
+finalState:
+  documentContents: "\"Hello\", \"World\""
+  selections:
+    - anchor: {line: 0, character: 16}
+      active: {line: 0, character: 16}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/lua/chuckName4.yml

@@ -0,0 +1,23 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck name
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: a,b = "Hello", "World"
+  selections:
+    - anchor: {line: 0, character: 22}
+      active: {line: 0, character: 22}
+  marks: {}
+finalState:
+  documentContents: "\"Hello\", \"World\""
+  selections:
+    - anchor: {line: 0, character: 16}
+      active: {line: 0, character: 16}

queries/lua.scm

@@ -42,6 +42,7 @@
     condition: (_) @condition
 ) @_.domain
 
+;; !!
 (if_statement
     "if" @branch.start
     consequence: (_) @branch.end
@@ -108,37 +109,72 @@
 ) @_.domain @anonymousFunction
 
 ;; Names and values
-(assignment_statement
-    (variable_list
-        name: (_) @name
-        ;; Handle multiple variable declarators in one statement, eg
-        ;;!! local b, c = "Hello", "World"
-        ;;!  ------^--^-------------------
-        (#allow-multiple! @name)
-    ) @_.leading.end.startOf
-) @_.domain
-(variable_declaration
+
+;; Handle variable assignments
+;;!! a = 42
+;;!  ^-----
+;;!  xxxx--
+(
     (assignment_statement
         (variable_list
             name: (_) @name
-            ;; Handle multiple variable declarators in one statement, eg
-            ;;!! local b, c = "Hello", "World"
-            ;;!  ------^--^-------------------
+            ;; Handle multiple variable assignments in one statement, eg
+            ;;!! b, c = "Hello", "World"
+            ;;!  ^--^-------------------
+            ;;!  xxxxxxx----------------
             (#allow-multiple! @name)
-        ) @_.leading.end.startOf
-    )
-) @_.domain
+        )
+        .
+        "="
+        .
+        (_) @_.leading.end.startOf
+    ) @dummy @_.leading.start.startOf @_.domain
+    (#not-parent-type? @dummy variable_declaration)
+)
+;; Handle variable declarations
+;;!! local a = 42
+;;!  ------^-----
+;;!  xxxxxxxxxx--
+(_
+    local_declaration: (variable_declaration
+        "local" @_.leading.start.startOf
+        .
+        (assignment_statement
+            (variable_list
+                name: (_) @name
+                ;; Handle multiple variable declarators in one statement, eg
+                ;;!! local b, c = "Hello", "World"
+                ;;!  ------^--^-------------------
+                ;;!  xxxxxxxxxxxxx----------------
+                (#allow-multiple! @name)
+            )
+            .
+            "="
+            (_) @_.leading.end.startOf
+        )
+    ) @_.domain
+)
+
+;; Handle assignment values
+;;!! a = 42
+;;!  ----------^^
+;;!  -------XXXXX
 (assignment_statement
     (_) @_.leading.start.endOf
     .
     (expression_list
         value: (_) @value
-        ;; Handle multiple variable declarators in one statement, eg
-        ;;!! local b, c = "Hello", "World"
-        ;;!  -------------^^^^^^^--^^^^^^^
+        ;; Handle multiple variable assignments in one statement, eg
+        ;;!! b, c = "Hello", "World"
+        ;;!  -------^^^^^^^--^^^^^^^
+        ;;!  ----xxxxxxxxxxxxxxxxxxx
         (#allow-multiple! @value)
     ) @_.leading.end.startOf
 ) @_.domain
+;; Handle variable declaration values
+;;!! local a = 42
+;;!  ----------^^
+;;!  -------XXXXX
 (variable_declaration
     (assignment_statement
         (_) @_.leading.start.endOf
@@ -148,6 +184,7 @@
             ;; Handle multiple variable declarators in one statement, eg
             ;;!! local b, c = "Hello", "World"
             ;;!  -------------^^^^^^^--^^^^^^^
+            ;;!  ----------xxxxxxxxxxxxxxxxxxx
             (#allow-multiple! @value)
         ) @_.leading.end.startOf
     )