Merge branch 'main' into stableVscodeCi

Author: AndreasArvidsson

.github/workflows/test.yml

@@ -100,13 +100,15 @@ jobs:
         env:
           NEOVIM_PATH: ${{ steps.vim.outputs.executable }}
 
-      - 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'
+      # 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: 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,8 +32,8 @@ 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_custom_command("chuck block")
+test api parsed: user.cursorless_x_custom_command("chuck block")
 test api parsed <user.cursorless_target>:
-    user.cursorless_custom_command("chuck block <target>", cursorless_target)
+    user.cursorless_x_custom_command("chuck block <target>", cursorless_target)
 test api parsed <user.cursorless_target> plus <user.cursorless_target>:
-    user.cursorless_custom_command("bring block <target1> after <target2>", cursorless_target_1, cursorless_target_2)
+    user.cursorless_x_custom_command("bring block <target1> after <target2>", cursorless_target_1, cursorless_target_2)

cursorless-talon/src/public_api.py

@@ -26,7 +26,7 @@ def cursorless_create_destination(
 
 @mod.action_class
 class CommandActions:
-    def cursorless_custom_command(
+    def cursorless_x_custom_command(
         content: str,  # pyright: ignore [reportGeneralTypeIssues]
         arg1: Optional[Any] = None,
         arg2: Optional[Any] = None,

cursorless-talon/src/spoken_forms.json

@@ -231,7 +231,7 @@
   },
   "experimental/experimental_actions.csv": {
     "experimental_action": {
-      "-from": "experimental.setInstanceReference"
+      "from": "experimental.setInstanceReference"
     }
   },
   "experimental/wrapper_snippets.csv": {},

data/fixtures/recorded/languages/typescript/takeEveryArgRam.yml

@@ -23,7 +23,7 @@ initialState:
 finalState:
   documentContents: foo(bar(baz, bongo), bazman)
   selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 19}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 27}
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 11}
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 18}

data/fixtures/recorded/positions/bringHarpToAfterFile.yml

@@ -28,6 +28,7 @@ initialState:
 finalState:
   documentContents: |-
     hello world
+
     hello
   selections:
     - anchor: {line: 0, character: 0}

data/fixtures/recorded/positions/bringWhaleToBeforeFile.yml

@@ -28,7 +28,8 @@ initialState:
 finalState:
   documentContents: |-
     world
+
     hello world
   selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 0}
+    - anchor: {line: 2, character: 0}
+      active: {line: 2, character: 0}

data/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml

@@ -28,6 +28,7 @@ initialState:
 finalState:
   documentContents: |-
     hello world
+
     hello
   selections:
     - anchor: {line: 0, character: 11}

data/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml

@@ -28,7 +28,8 @@ initialState:
 finalState:
   documentContents: |-
     world
+
     hello world
   selections:
-    - anchor: {line: 1, character: 11}
-      active: {line: 1, character: 11}
+    - anchor: {line: 2, character: 11}
+      active: {line: 2, character: 11}

data/fixtures/scopes/csharp/argument.actual.constructor.iteration.scope

@@ -0,0 +1,10 @@
+new Foo(a, b);
+---
+
+[Range] = 0:8-0:12
+          >----<
+0| new Foo(a, b);
+
+[Domain] = 0:0-0:13
+  >-------------<
+0| new Foo(a, b);