Fix arg and condition and add more tests

Author: fidgetingbits

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

@@ -0,0 +1,50 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: bring arg air after bat
+  action:
+    name: replaceWithTarget
+    source:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: a}
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+    destination:
+      type: primitive
+      insertionMode: after
+      target:
+        type: primitive
+        mark: {type: decoratedSymbol, symbolColor: default, character: b}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function makeCounter(a, b)
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}
+  marks:
+    default.a:
+      start: {line: 0, character: 21}
+      end: {line: 0, character: 22}
+    default.b:
+      start: {line: 0, character: 24}
+      end: {line: 0, character: 25}
+finalState:
+  documentContents: |-
+    function makeCounter(a, b, a)
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}

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

@@ -0,0 +1,34 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: change inside funk
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - {type: interiorOnly}
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function makeCounter()
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 1, character: 19}
+      active: {line: 1, character: 19}
+  marks: {}
+finalState:
+  documentContents: |-
+    function makeCounter()
+        
+    end
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}

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

@@ -0,0 +1,37 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: change inside lambda
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - {type: interiorOnly}
+        - type: containingScope
+          scopeType: {type: anonymousFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function makeCounter()
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 3, character: 19}
+      active: {line: 3, character: 19}
+  marks: {}
+finalState:
+  documentContents: |-
+    function makeCounter()
+        local count = 0
+        return function()
+            
+        end
+    end
+  selections:
+    - anchor: {line: 3, character: 8}
+      active: {line: 3, character: 8}

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

@@ -0,0 +1,37 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck arg
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function makeCounter(a, b)
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 22}
+      active: {line: 0, character: 22}
+  marks: {}
+finalState:
+  documentContents: |-
+    function makeCounter(b)
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}

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

@@ -0,0 +1,37 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck arg
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: argumentOrParameter}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    function makeCounter(a)
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 22}
+      active: {line: 0, character: 22}
+  marks: {}
+finalState:
+  documentContents: |-
+    function makeCounter()
+        local count = 0
+        return function()
+            count = count + 1
+            return count
+        end
+    end
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}

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

@@ -0,0 +1,37 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck item
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: collectionItem}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    local person = {
+        name = "John",
+        age = 30,
+        hobbies = {"reading", "gaming", "programming"},
+        address = {
+            street = "123 Main St",
+            city = "Example City"
+        }
+    }
+  selections:
+    - anchor: {line: 4, character: 6}
+      active: {line: 4, character: 6}
+  marks: {}
+finalState:
+  documentContents: |-
+    local person = {
+        name = "John",
+        age = 30,
+        hobbies = {"reading", "gaming", "programming"}
+    }
+  selections:
+    - anchor: {line: 3, character: 50}
+      active: {line: 3, character: 50}

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

@@ -0,0 +1,23 @@
+languageId: lua
+command:
+  version: 6
+  spokenForm: chuck item
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: collectionItem}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hobbies = {"reading"}
+  selections:
+    - anchor: {line: 0, character: 19}
+      active: {line: 0, character: 19}
+  marks: {}
+finalState:
+  documentContents: hobbies = {}
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}

queries/lua.scm

@@ -38,11 +38,10 @@
 )
 
 ;; Conditionals
-(
-    (_
-        condition: (_) @condition
-    )
+(_
+    condition: (_) @condition
 )
+
 (if_statement
     "if" @branch.start
     consequence: (_) @branch.end
@@ -80,10 +79,20 @@
 ) @_.domain @functionCall
 
 (arguments
-    (_) @argumentOrParameter
+    (_)? @_.leading.start.endOf
+    .
+    (_) @argumentOrParameter @_.leading.end.startOf @_.trailing.start.endOf
+    .
+    (_)? @_.trailing.end.startOf
+    (#insertion-delimiter! @argumentOrParameter ", ")
 ) @argumentOrParameter.iteration
 (parameters
-    (_) @argumentOrParameter
+    (_)? @_.leading.start.endOf
+    .
+    (_) @argumentOrParameter @_.leading.end.startOf @_.trailing.start.endOf
+    .
+    (_)? @_.trailing.end.startOf
+    (#insertion-delimiter! @argumentOrParameter ", ")
 ) @argumentOrParameter.iteration
 
 (function_declaration