Merge branch 'main' into treeSitter

Author: AndreasArvidsson

.github/workflows/test.yml

@@ -63,23 +63,23 @@ jobs:
         run: xvfb-run -a pnpm --color test
         if: runner.os == 'Linux'
 
-      - name: Run tests (Other)
+      - name: Run tests (Win,Mac)
         run: pnpm --color test
         if: runner.os != 'Linux'
 
       - name: Run Talon-JS tests (Linux)
         run: xvfb-run -a pnpm -F @cursorless/test-harness test:talonJs
         if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
-      - name: Run Talon-JS tests (Other)
+      - name: Run Talon-JS tests (Win,Mac)
         run: pnpm -F @cursorless/test-harness test:talonJs
         if: runner.os != 'Linux' && matrix.app_version == 'stable'
 
       - name: Run Cursorless-everywhere-talon tests (Linux)
         run: xvfb-run -a pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
         if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
-      - name: Run Cursorless-everywhere-talon tests (Other)
+      - name: Run Cursorless-everywhere-talon tests (Win,Mac)
         run: pnpm -F @cursorless/cursorless-everywhere-talon-e2e test:quickjs
         if: runner.os != 'Linux' && matrix.app_version == 'stable'
 
@@ -120,11 +120,11 @@ jobs:
           packagePath: packages/cursorless-vscode/dist
           dryRun: true
 
-      - name: Rename vsix
+      - name: Rename vsix (Linux)
         run: mv ${{ steps.createVsix.outputs.vsixPath }} cursorless-development.vsix
         if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
-      - name: Upload vsix
+      - name: Upload vsix (Linux)
         uses: actions/upload-artifact@v4
         if: runner.os == 'Linux' && matrix.app_version == 'stable'
         with:

changelog/2025-04-addedArgumentListScope.md

@@ -0,0 +1,6 @@
+---
+tags: [enhancement]
+pullRequest: 2907
+---
+
+- Added `"arg list"` scope. The argument list is the entire list of arguments in a declared function.

cursorless-talon/src/spoken_forms.json

@@ -125,6 +125,7 @@
   "modifier_scope_types.csv": {
     "scope_type": {
       "arg": "argumentOrParameter",
+      "arg list": "argumentList",
       "attribute": "attribute",
       "call": "functionCall",
       "callee": "functionCallee",

data/fixtures/recorded/everyScope/takeEveryToken.yml

@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: take every token
+  action:
+    name: setSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: everyScope
+          scopeType: {type: token}
+  usePrePhraseSnapshot: false
+initialState:
+  documentContents: |-
+    aaa bbb ccc
+    ddd eee
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 11}
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 7}
+  marks: {}
+finalState:
+  documentContents: |-
+    aaa bbb ccc
+    ddd eee
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 7}
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 11}
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 7}

data/fixtures/scopes/csharp/class.iteration.document.scope

@@ -1,18 +1,18 @@
-// starting content
-public class BankAccount {}
-// ending content
+
+public class BankAccount { }
+
 ---
 
 [#1 Range] =
-[#1 Domain] = 0:0-2:17
-  >-------------------
-0| // starting content
-1| public class BankAccount {}
-2| // ending content
-   -----------------<
+[#1 Domain] = 0:0-2:0
+  >
+0|
+1| public class BankAccount { }
+2|
+   <
 
 
 [#2 Range] =
-[#2 Domain] = 1:26-1:26
-                            ><
-1| public class BankAccount {}
+[#2 Domain] = 1:26-1:27
+                            >-<
+1| public class BankAccount { }

data/fixtures/scopes/csharp/className.iteration.document.scope

@@ -1,18 +1,18 @@
-// starting content
-public class BankAccount {}
-// ending content
+
+public class BankAccount { }
+
 ---
 
 [#1 Range] =
-[#1 Domain] = 0:0-2:17
-  >-------------------
-0| // starting content
-1| public class BankAccount {}
-2| // ending content
-   -----------------<
+[#1 Domain] = 0:0-2:0
+  >
+0|
+1| public class BankAccount { }
+2|
+   <
 
 
 [#2 Range] =
-[#2 Domain] = 1:26-1:26
-                            ><
-1| public class BankAccount {}
+[#2 Domain] = 1:26-1:27
+                            >-<
+1| public class BankAccount { }

data/fixtures/scopes/css/name.iteration.document.scope

@@ -1,24 +1,18 @@
-* {
-    color: red;
-    padding: 1rem;
-}
+
+* { color: red; }
+
 ---
 
 [#1 Range] =
-[#1 Domain] = 0:0-3:1
-  >---
-0| * {
-1|     color: red;
-2|     padding: 1rem;
-3| }
-   -<
+[#1 Domain] = 0:0-2:0
+  >
+0|
+1| * { color: red; }
+2|
+   <
 
 
 [#2 Range] =
-[#2 Domain] = 0:3-3:0
-     >
-0| * {
-1|     color: red;
-2|     padding: 1rem;
-3| }
-   <
+[#2 Domain] = 1:3-1:16
+     >-------------<
+1| * { color: red; }

data/fixtures/scopes/css/statement.iteration.document.scope

@@ -1,14 +1,12 @@
-* {
-    color: red;
-}
+
+* { color: red; }
 
 ---
 
 [Range] =
-[Domain] = 0:0-3:0
-  >---
-0| * {
-1|     color: red;
-2| }
-3|
+[Domain] = 0:0-2:0
+  >
+0|
+1| * { color: red; }
+2|
    <

data/fixtures/scopes/java/argument.formal.constructor2.scope

@@ -0,0 +1,46 @@
+public class MyClass {
+    public MyClass(
+        String name,
+        int age
+    ) {}
+}
+---
+
+[#1 Content] =
+[#1 Domain] = 2:8-2:19
+          >-----------<
+2|         String name,
+
+[#1 Removal] = 2:8-3:8
+          >------------
+2|         String name,
+3|         int age
+   --------<
+
+[#1 Trailing delimiter] = 2:19-3:8
+                     >-
+2|         String name,
+3|         int age
+   --------<
+
+[#1 Insertion delimiter] = ",\n"
+
+
+[#2 Content] =
+[#2 Domain] = 3:8-3:15
+          >-------<
+3|         int age
+
+[#2 Removal] = 2:19-3:15
+                     >-
+2|         String name,
+3|         int age
+   ---------------<
+
+[#2 Leading delimiter] = 2:19-3:8
+                     >-
+2|         String name,
+3|         int age
+   --------<
+
+[#2 Insertion delimiter] = ",\n"