Merge branch 'main' into removedLegacy

Author: AndreasArvidsson

.github/actions/test-neovim-lua/action.yml

@@ -7,6 +7,8 @@ runs:
       with:
         luaVersion: "luajit-openresty"
     - uses: leafo/gh-actions-luarocks@v5
+      with:
+        luarocksVersion: "3.12.0"
     - shell: bash
       run: |
         luarocks install busted

.github/workflows/test.yml

@@ -100,15 +100,13 @@ jobs:
         env:
           NEOVIM_PATH: ${{ steps.vim.outputs.executable }}
 
-      # FIXME: Re-enable neovim lua tests
-      # https://github.com/cursorless-dev/cursorless/issues/2946
-      # - name: Run neovim lua tests (Linux)
-      #   uses: ./.github/actions/test-neovim-lua/
-      #   if: runner.os == 'Linux' && matrix.app_version == 'stable'
-
-      # - name: Run neovim lua lint (Linux)
-      #   uses: ./.github/actions/lint-lua-ls/
-      #   if: runner.os == 'Linux' && matrix.app_version == 'stable'
+      - name: Run neovim lua tests (Linux)
+        uses: ./.github/actions/test-neovim-lua/
+        if: runner.os == 'Linux' && matrix.app_version == 'stable'
+
+      - name: Run neovim lua lint (Linux)
+        uses: ./.github/actions/lint-lua-ls/
+        if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
       - name: Create vscode dist that can be installed locally
         run: pnpm -F @cursorless/cursorless-vscode populate-dist --local-install

cursorless-talon-dev/src/cursorless_test.talon

@@ -32,7 +32,9 @@ test api extract decorated marks <user.cursorless_target>:
 test api alternate highlight nothing:
     user.private_cursorless_test_alternate_highlight_nothing()
 
-test api parsed: user.cursorless_x_custom_command("chuck block")
+test api parsed chuck block: user.cursorless_x_custom_command("chuck block")
+test api parsed take next token: user.cursorless_x_custom_command("take next token")
+test api parsed change next instance: user.cursorless_x_custom_command("change next instance")
 test api parsed <user.cursorless_target>:
     user.cursorless_x_custom_command("chuck block <target>", cursorless_target)
 test api parsed <user.cursorless_target> plus <user.cursorless_target>:

data/fixtures/recorded/languages/cpp/clearSubject2.yml

@@ -28,11 +28,11 @@ initialState:
 finalState:
   documentContents: |
     int main() {
-      switch (int i = rand() % 100; ) {
+      switch () {
         default:
         break;
       }
     }
   selections:
-    - anchor: {line: 1, character: 32}
-      active: {line: 1, character: 32}
+    - anchor: {line: 1, character: 10}
+      active: {line: 1, character: 10}

data/fixtures/recorded/languages/rust/changeArgBlueAir.yml

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg blue air
+  spokenForm: change type blue air
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: blue, character: a}
   usePrePhraseSnapshot: true
 initialState:

data/fixtures/recorded/languages/rust/changeArgSun.yml

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg sun
+  spokenForm: change type sun
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: s}
   usePrePhraseSnapshot: true
 initialState:

data/fixtures/recorded/languages/rust/changeArgTrap.yml

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg trap
+  spokenForm: change type trap
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: argumentOrParameter}
+          scopeType: {type: type}
       mark: {type: decoratedSymbol, symbolColor: default, character: t}
   usePrePhraseSnapshot: true
 initialState:

data/fixtures/recorded/languages/rust/changeArgTrapAndBlueTrap.yml

@@ -1,7 +1,7 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change arg trap and blue trap
+  spokenForm: change arg trap and type blue trap
   action:
     name: clearAndSetSelection
     target:
@@ -13,6 +13,9 @@ command:
               scopeType: {type: argumentOrParameter}
           mark: {type: decoratedSymbol, symbolColor: default, character: t}
         - type: primitive
+          modifiers:
+            - type: containingScope
+              scopeType: {type: type}
           mark: {type: decoratedSymbol, symbolColor: blue, character: t}
   usePrePhraseSnapshot: true
 initialState:

data/fixtures/recorded/languages/rust/changeNameDrum2.yml

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name drum
+  spokenForm: change key drum
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: d}
   usePrePhraseSnapshot: true
 initialState:

data/fixtures/recorded/languages/rust/changeNameDrum3.yml

@@ -1,14 +1,14 @@
 languageId: rust
 command:
   version: 6
-  spokenForm: change name drum
+  spokenForm: change key drum
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: name}
+          scopeType: {type: collectionKey}
       mark: {type: decoratedSymbol, symbolColor: default, character: d}
   usePrePhraseSnapshot: true
 initialState: