Merge branch 'main' into stableVscodeCi

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

changelog/2025-06-migrateClojure.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2951
+---
+
+- Migrated Clojure implementations from legacy to Tree sitter queries.

changelog/2025-06-migrateLatex.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2952
+---
+
+- Migrated Latex implementations from legacy to Tree sitter queries.

changelog/2025-06-migrateRuby.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2949
+---
+
+- Migrated Ruby implementations from legacy to Tree sitter queries.

changelog/2025-06-migrateScala.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2948
+---
+
+- Migrated Scala implementations from legacy to Tree sitter queries.

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>:

cursorless-talon/src/check_community_repo.py

@@ -8,6 +8,7 @@
 ]
 
 required_actions = [
+    "code.language",
     "user.homophones_get",
     "user.insert_snippet_by_name",
     "user.reformat_text",

cursorless-talon/src/snippets/snippet_types.py

@@ -62,6 +62,7 @@ def create(
 @dataclass
 class ListInsertionSnippet:
     type = "list"
+    fallbackLanguage: str | None
     substitutions: dict[str, str] | None
     snippets: list[CustomInsertionSnippet]
 
@@ -98,6 +99,7 @@ def create(snippet: CommunityWrapperSnippet):
 @dataclass
 class ListWrapperSnippet:
     type = "list"
+    fallbackLanguage: str | None
     snippets: list[CustomWrapperSnippet]
 
 

cursorless-talon/src/snippets/snippets.py

@@ -100,7 +100,7 @@ class UserActions:
     def insert_snippet_by_name(
         name: str,  # pyright: ignore [reportGeneralTypeIssues]
         # Don't add optional: we need to match the type in community
-        substitutions: dict[str, str] = None,
+        substitutions: dict[str, str] = None,  # type: ignore
     ):
         action = InsertSnippetAction(
             get_list_insertion_snippet(name, substitutions),