Merge branch 'main' into main

Author: rinOfTheStars

.nvmrc

@@ -1 +1 @@
-v20.18.0
+v24.4.0

.vscode/settings.json

@@ -28,6 +28,11 @@
     ".busted": "lua"
   },
   "files.eol": "\n",
+  "github.copilot.chat.codeGeneration.instructions": [
+    {
+      "file": "./packages/cursorless-org-docs/src/docs/contributing/scope-test-format.md"
+    }
+  ],
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "typescript.tsdk": "node_modules/typescript/lib",
   // Turn off tsc task auto detection since we have the necessary tasks as npm scripts

changelog/2023-09-addedDestinationAndScopeTypeToInsertSnippetAction.md

@@ -3,4 +3,4 @@ tags: [enhancement, talon]
 pullRequest: 1879
 ---
 
-- Added `destination: CursorlessDestination` and `scope_type: Optional[Union[str, list[str]]]` arguments to the public Talon api action `user.cursorless_insert_snippet`. See the [talon-side api docs](https://www.cursorless.org/docs/user/customization/#public-talon-actions) for more.
+- Added `destination: CursorlessDestination` and `scope_type: Optional[Union[str, list[str]]]` arguments to the public Talon api action `user.cursorless_insert_snippet`. See the [talon-side api docs](https://www.cursorless.org/docs/user/customization#public-talon-actions) for more.

changelog/2023-09-addedInsertPythonAction.md

@@ -4,4 +4,4 @@ pullRequest: 1875
 mergeDate: 2023-09-10
 ---
 
-- Added `cursorless_insert` action to the public Talon api. This api enables you to define custom grammars for Cursorless text insertion. See the [talon-side api docs](https://www.cursorless.org/docs/user/customization/#public-talon-actions) for more
+- Added `cursorless_insert` action to the public Talon api. This api enables you to define custom grammars for Cursorless text insertion. See the [talon-side api docs](https://www.cursorless.org/docs/user/customization#public-talon-actions) for more

changelog/2025-07-scopeDocumentation.md

@@ -0,0 +1,6 @@
+---
+tags: [documentation]
+pullRequest: 3016
+---
+
+- Visualize scope tests in docs. Visualizes scope fixtures on [cursorless.org/docs/user/languages](https://www.cursorless.org/docs/user/languages).

cursorless-talon/docs/customization.md

@@ -1 +1 @@
-Cursorless is now monorepo 🙌. This document now lives at https://www.cursorless.org/docs/user/customization/.
+Cursorless is now monorepo 🙌. This document now lives at https://www.cursorless.org/docs/user/customization.

cursorless-talon/src/marks/lines_number.py

@@ -19,7 +19,7 @@ class CustomizableTerm:
 
 
 # NOTE: Please do not change these dicts.  Use the CSVs for customization.
-# See https://www.cursorless.org/docs/user/customization/
+# See https://www.cursorless.org/docs/user/customization
 directions = [
     CustomizableTerm("lineNumberModulo100", "modulo100", lambda number: number - 1),
     CustomizableTerm("lineNumberRelativeUp", "relative", lambda number: -number),

cursorless-talon/src/spoken_forms.py

@@ -156,7 +156,6 @@ def handle_new_values(csv_name: str, values: list[SpokenFormEntry]):
             ],
             extra_allowed_values=[
                 "private.fieldAccess",
-                "private.switchStatementSubject",
                 "textFragment",
                 "disqualifyDelimiter",
                 "pairDelimiter",

data/fixtures/recorded/customRegex/clearWhite.yml

@@ -12,7 +12,7 @@ command:
   usePrePhraseSnapshot: true
 spokenFormError: >-
   custom regex with id \p{Zs}+; please see
-  https://www.cursorless.org/docs/user/customization/ for more information
+  https://www.cursorless.org/docs/user/customization for more information
 initialState:
   documentContents: "\"  \""
   selections:

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

@@ -1,18 +1,15 @@
 languageId: cpp
 command:
   version: 6
-  spokenForm: change subject
+  spokenForm: change value
   action:
     name: clearAndSetSelection
     target:
       type: primitive
       modifiers:
         - type: containingScope
-          scopeType: {type: private.switchStatementSubject}
+          scopeType: {type: value}
   usePrePhraseSnapshot: true
-spokenFormError: >-
-  simple scope type type with id private.switchStatementSubject; this is a
-  private spoken form currently only for internal experimentation
 initialState:
   documentContents: |
     int main() {