Merge branch 'main' into nix-flake

.editorconfig

@@ -22,7 +22,7 @@ insert_final_newline = false
 # with a line that has trailing white space. Many of our recorded
 # tests use strings with trailing white space to represent the final
 # document contents. For example
-# packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
+# data/fixtures/recorded/languages/ruby/changeCondition.yml
 trim_trailing_whitespace = false
 
 [Makefile]

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 *       @pokey @AndreasArvidsson
 
-*keyboard* @pokey @josharian
-*Keyboard* @pokey @josharian
+*keyboard* @pokey @AndreasArvidsson @josharian
+*Keyboard* @pokey @AndreasArvidsson @josharian

.github/DISCUSSION_TEMPLATE/architectural-decision-record.yml

@@ -0,0 +1,27 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        You are submitting to our Architecture Decision Record.
+        Learn more about ADRs at <https://adr.github.io>, and discussion #1211.
+
+  - type: textarea
+    attributes:
+      label: Context
+      description: The issue motivating this decision, and any context that influences or constrains the decision.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Options considered
+
+  - type: textarea
+    attributes:
+      label: Decision
+      description: "The change that we're proposing or have agreed to implement."
+
+  - type: textarea
+    attributes:
+      label: Consequences
+      description: What becomes easier or more difficult to do and any risks introduced by the change that will need to be mitigated.

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/deploy.yaml

@@ -14,13 +14,13 @@ jobs:
     env:
       CURSORLESS_REPO_ROOT: ${{ github.workspace }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - run: corepack enable
+      - uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
+          node-version-file: .nvmrc
           cache: pnpm
       - run: pnpm --color install
       - run: pnpm --color compile
@@ -46,7 +46,7 @@ jobs:
     needs: publish-extension
     environment: production
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.CURSORLESS_BOT_TOKEN }}

.github/workflows/forbid-todo.yml

@@ -0,0 +1,15 @@
+name: Forbid TODO
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [main]
+
+jobs:
+  forbid-todo:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Forbid TODO
+        run: ./scripts/forbid-todo.sh

.github/workflows/pre-commit.yml

@@ -14,14 +14,14 @@ jobs:
     name: Pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - run: corepack enable
+      - uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
+          node-version-file: .nvmrc
           cache: pnpm
       - run: pnpm --color install
       - uses: pre-commit/action@v3.0.0

.github/workflows/test-docs.yml

@@ -12,10 +12,10 @@ jobs:
     env:
       CURSORLESS_REPO_ROOT: ${{ github.workspace }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - run: corepack enable
+      - uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
+          node-version-file: .nvmrc
           cache: pnpm
       - run: bash -x scripts/build-and-assemble-website.sh

.github/workflows/test.yml

@@ -27,11 +27,11 @@ jobs:
       VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
       CURSORLESS_REPO_ROOT: ${{ github.workspace }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - run: corepack enable
+      - uses: actions/setup-node@v4
         with:
-          node-version-file: package.json
+          node-version-file: .nvmrc
           cache: pnpm
       - run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}"
         shell: bash
@@ -55,22 +55,20 @@ jobs:
       - run: mv ${{ steps.createVsix.outputs.vsixPath }} cursorless-development.vsix
         if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
       - name: Upload vsix
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: runner.os == 'Linux' && matrix.vscode_version == 'stable'
         with:
           name: vsix
           path: cursorless-development.vsix
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: logs
           path: ${{ env.VSCODE_LOGS_DIR }}
         if: failure()
       - name: Archive dumps
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dumps
           path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
-      - name: Forbid TODOs
-        run: ./scripts/forbid-todo.sh

.nvmrc

@@ -0,0 +1 @@
+v20.12.1

.pre-commit-config.yaml

@@ -39,8 +39,8 @@ repos:
         # with a line that has trailing white space. Many of our recorded
         # tests use strings with trailing white space to represent the final
         # document contents. For example
-        # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
-        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^patches/
+        # data/fixtures/recorded/languages/ruby/changeCondition.yml
+        exclude: ^data/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^patches/
   - repo: local
     hooks:
       - id: eslint
@@ -61,26 +61,23 @@ repos:
     hooks:
       - id: format-recorded-tests
         name: format-recorded-tests
-        files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
+        files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
         entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
   - repo: local
     hooks:
       - id: check-recorded-test-marks
         name: check-recorded-test-marks
-        files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
+        files: ^data/fixtures/recorded/.*/[^/]*\.yml$
         language: system
         entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
   - repo: https://github.com/ikamensh/flynt
     rev: "1.0.1"
     hooks:
       - id: flynt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.4.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1
-    hooks:
-      - id: black
+      - id: ruff-format

.prettierignore

@@ -2,7 +2,7 @@
 **/generated
 
 # We use our own format for our recorded yaml tests to keep them compact
-/packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/**/*.yml
+/data/fixtures/recorded/**/*.yml
 
 pnpm-lock.yaml
 

.prettierrc

@@ -1,3 +1,4 @@
 {
-  "trailingComma": "all"
+  "trailingComma": "all",
+  "plugins": ["prettier-plugin-tailwindcss"]
 }

.vscode/extensions.json

@@ -7,6 +7,7 @@
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode",
     "jrieken.vscode-tree-sitter-query",
-    "wenkokke.tree-sitter-talon"
+    "wenkokke.tree-sitter-talon",
+    "usernamehw.commands"
   ]
 }

.vscode/launch.json

@@ -34,7 +34,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -55,7 +55,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "Prepare test subset",
@@ -125,7 +125,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -147,7 +147,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTestsVscode.cjs"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",

.vscode/settings.json

@@ -1,7 +1,7 @@
 // Place your settings in this file to overwrite default and user settings.
 {
   "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter"
+    "editor.defaultFormatter": "charliermarsh.ruff"
   },
   "[scm]": {
     "editor.defaultFormatter": "AndreasArvidsson.andreas-talon"

.vscode/tasks.json

@@ -66,7 +66,6 @@
       "label": "Generate grammar",
       "type": "npm",
       "script": "generate-grammar",
-      "path": "packages/cursorless-vscode",
       "presentation": {
         "reveal": "silent"
       },

changelog/2024-03-addLuaSupport.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 1962
+---
+
+- Add support for the Lua programming language

changelog/2024-03-addedSpreadModifier.md

@@ -0,0 +1,9 @@
+---
+tags: [enhancement]
+pullRequest: 2254
+---
+
+- Added every/spread ordinal/relative modifier. Turns relative and ordinal range modifiers into multiple target selections instead of contiguous range.
+
+- `"take every two tokens"` selects two tokens as separate selections
+- `"pre every first two lines"` puts a cursor before each of first two lines in block (results in multiple cursors)

changelog/2024-03-fallBackToTalonActions.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2235
+---
+
+- Fall back to text-based Talon actions when editor is not focused. This allows you to say things like "take token", "bring air", etc, when in the terminal, search bar, etc.

changelog/2024-04-community-snippets.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 1998
+---
+
+- Add support for using community snippets for wrapping / cursorless insertion instead of snippets defined in Cursorless. See [Using community snippets](../docs/user/experimental/snippets.md#using-community-snippets) for more information.

changelog/2024-05-reformatPublicAPI.md

@@ -0,0 +1,7 @@
+---
+tags: [enhancement]
+pullRequest: 2358
+---
+
+- Added public `user.cursorless_reformat` action to the Cursorless api
+  eg: `user.cursorless_reformat(cursorless_target, "ALL_CAPS")`

cursorless-talon-dev/src/cursorless_dev.talon

@@ -10,6 +10,10 @@ tag: user.cursorless
     user.run_rpc_command("cursorless.recordTestCase")
 {user.cursorless_homophone} record one:
     user.run_rpc_command("cursorless.recordOneTestCaseThenPause")
+{user.cursorless_homophone} record scope:
+    user.run_rpc_command("cursorless.recordScopeTests.showUnimplementedFacets")
+{user.cursorless_homophone} save scope:
+    user.run_rpc_command("cursorless.recordScopeTests.saveActiveDocument")
 {user.cursorless_homophone} pause:
     user.run_rpc_command("cursorless.pauseRecording")
 {user.cursorless_homophone} resume: