Skip to content

Commit c5b85a8

Browse files
Merge branch 'main' into customCommandDocs
2 parents 7e31dd8 + c67cf71 commit c5b85a8

169 files changed

Lines changed: 3165 additions & 1045 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
env:
1919
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
20+
ESLINT_USE_FLAT_CONFIG: false
2021

2122
steps:
2223
- name: Checkout repository

cursorless-talon/src/fallback.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
assert COMMAND_VERSION == 7
99

1010
action_callbacks = {
11-
"getText": lambda: [actions.edit.selected_text()],
1211
"setSelection": actions.skip,
1312
"setSelectionBefore": actions.edit.left,
1413
"setSelectionAfter": actions.edit.right,
@@ -75,6 +74,12 @@ def get_action_callback(fallback: dict) -> Callable:
7574
return lambda: wrap_with_paired_delimiter(
7675
fallback["left"], fallback["right"]
7776
)
77+
case "getText":
78+
return lambda: [actions.edit.selected_text()]
79+
case "findInWorkspace":
80+
return lambda: actions.user.find_everywhere(actions.edit.selected_text())
81+
case "findInDocument":
82+
return lambda: actions.edit.find(actions.edit.selected_text())
7883

7984
raise ValueError(f"Unknown Cursorless fallback action: {action}")
8085

cursorless.nvim/node/command-server/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@
1111
"main": "./index/index.cjs",
1212
"private": true,
1313
"devDependencies": {
14-
"@types/glob": "^7.1.3",
15-
"@types/mocha": "8.0.4",
14+
"@types/mocha": "10.0.10",
1615
"@types/node": "20.17.50",
1716
"@types/rimraf": "^3.0.0",
18-
"@types/vscode": "^1.53.0",
17+
"@types/vscode": "1.53.0",
1918
"@typescript-eslint/eslint-plugin": "8.32.1",
2019
"@typescript-eslint/parser": "8.32.1",
2120
"esbuild": "0.25.4",
22-
"eslint": "8.57.1",
23-
"glob": "^7.1.6",
21+
"eslint": "9.27.0",
22+
"glob": "11.0.0",
2423
"mocha": "8.1.3",
2524
"typescript": "5.8.3",
26-
"vscode-test": "^1.4.1",
25+
"vscode-test": "1.6.1",
2726
"neovim": "^5.0.1"
2827
},
2928
"dependencies": {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ initialState:
2323
finalState:
2424
documentContents: foo(bar(baz, bongo), bazman)
2525
selections:
26-
- anchor: {line: 0, character: 4}
27-
active: {line: 0, character: 19}
28-
- anchor: {line: 0, character: 21}
29-
active: {line: 0, character: 27}
26+
- anchor: {line: 0, character: 8}
27+
active: {line: 0, character: 11}
28+
- anchor: {line: 0, character: 13}
29+
active: {line: 0, character: 18}

data/fixtures/recorded/positions/bringHarpToAfterFile.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ initialState:
2828
finalState:
2929
documentContents: |-
3030
hello world
31+
3132
hello
3233
selections:
3334
- anchor: {line: 0, character: 0}

data/fixtures/recorded/positions/bringWhaleToBeforeFile.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ initialState:
2828
finalState:
2929
documentContents: |-
3030
world
31+
3132
hello world
3233
selections:
33-
- anchor: {line: 1, character: 0}
34-
active: {line: 1, character: 0}
34+
- anchor: {line: 2, character: 0}
35+
active: {line: 2, character: 0}

data/fixtures/recorded/selectionTypes/bringHarpToAfterFile.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ initialState:
2828
finalState:
2929
documentContents: |-
3030
hello world
31+
3132
hello
3233
selections:
3334
- anchor: {line: 0, character: 11}

data/fixtures/recorded/selectionTypes/bringWhaleToBeforeFile.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ initialState:
2828
finalState:
2929
documentContents: |-
3030
world
31+
3132
hello world
3233
selections:
33-
- anchor: {line: 1, character: 11}
34-
active: {line: 1, character: 11}
34+
- anchor: {line: 2, character: 11}
35+
active: {line: 2, character: 11}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
new Foo(a, b);
2+
---
3+
4+
[Range] = 0:8-0:12
5+
>----<
6+
0| new Foo(a, b);
7+
8+
[Domain] = 0:0-0:13
9+
>-------------<
10+
0| new Foo(a, b);
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
new Foo(a, b);
2+
---
3+
4+
[#1 Content] =
5+
[#1 Domain] = 0:8-0:9
6+
>-<
7+
0| new Foo(a, b);
8+
9+
[#1 Removal] = 0:8-0:11
10+
>---<
11+
0| new Foo(a, b);
12+
13+
[#1 Trailing delimiter] = 0:9-0:11
14+
>--<
15+
0| new Foo(a, b);
16+
17+
[#1 Insertion delimiter] = ", "
18+
19+
20+
[#2 Content] =
21+
[#2 Domain] = 0:11-0:12
22+
>-<
23+
0| new Foo(a, b);
24+
25+
[#2 Removal] = 0:9-0:12
26+
>---<
27+
0| new Foo(a, b);
28+
29+
[#2 Leading delimiter] = 0:9-0:11
30+
>--<
31+
0| new Foo(a, b);
32+
33+
[#2 Insertion delimiter] = ", "

0 commit comments

Comments
 (0)