Skip to content

Commit 287a3e1

Browse files
AndreasArvidssonAndreasArvidsson
authored
Merge branch 'main' into stableVscodeCi
2 parents fd2aab4 + ad7c76e commit 287a3e1

File tree

125 files changed

+7450
-3915
lines changed

Some content is hidden

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

125 files changed

+7450
-3915
lines changed

‎.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: 10 additions & 11 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",
16-
"@types/node": "^18.19.22",
14+
"@types/mocha": "10.0.10",
15+
"@types/node": "20.17.50",
1716
"@types/rimraf": "^3.0.0",
18-
"@types/vscode": "^1.53.0",
19-
"@typescript-eslint/eslint-plugin": "^4.9.0",
20-
"@typescript-eslint/parser": "^4.9.0",
21-
"esbuild": "^0.20.2",
22-
"eslint": "^7.15.0",
23-
"glob": "^7.1.6",
17+
"@types/vscode": "1.53.0",
18+
"@typescript-eslint/eslint-plugin": "8.32.1",
19+
"@typescript-eslint/parser": "8.32.1",
20+
"esbuild": "0.25.4",
21+
"eslint": "9.27.0",
22+
"glob": "11.0.0",
2423
"mocha": "8.1.3",
25-
"typescript": "^4.1.2",
26-
"vscode-test": "^1.4.1",
24+
"typescript": "5.8.3",
25+
"vscode-test": "1.6.1",
2726
"neovim": "^5.0.1"
2827
},
2928
"dependencies": {

‎data/fixtures/scopes/java/type.field.scope‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,32 @@ class MyClass {
3939

4040

4141
[#3 Content] =
42-
[#3 Removal] =
4342
[#3 Domain] = 1:8-1:11
4443
>---<
4544
1| Map<int, int> foo;
4645

47-
[#3 Insertion delimiter] = " "
46+
[#3 Removal] = 1:8-1:13
47+
>-----<
48+
1| Map<int, int> foo;
49+
50+
[#3 Trailing delimiter] = 1:11-1:13
51+
>--<
52+
1| Map<int, int> foo;
53+
54+
[#3 Insertion delimiter] = ", "
4855

4956

5057
[#4 Content] =
5158
[#4 Domain] = 1:13-1:16
5259
>---<
5360
1| Map<int, int> foo;
5461

55-
[#4 Removal] = 1:12-1:16
56-
>----<
62+
[#4 Removal] = 1:11-1:16
63+
>-----<
5764
1| Map<int, int> foo;
5865

59-
[#4 Leading delimiter] = 1:12-1:13
60-
>-<
66+
[#4 Leading delimiter] = 1:11-1:13
67+
>--<
6168
1| Map<int, int> foo;
6269

63-
[#4 Insertion delimiter] = " "
70+
[#4 Insertion delimiter] = ", "

‎data/fixtures/scopes/java/type.typeArgument.iteration.scope‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
class MyClass {
2-
Map<int, int> foo;
3-
}
1+
Map<int, int> foo;
42
---
53

6-
[#1 Range] =
7-
[#1 Domain] = 0:15-2:0
8-
>
9-
0| class MyClass {
10-
1| Map<int, int> foo;
11-
2| }
12-
<
13-
14-
15-
[#2 Range] =
16-
[#2 Domain] = 1:8-1:16
17-
>--------<
18-
1| Map<int, int> foo;
4+
[Range] =
5+
[Domain] = 0:4-0:12
6+
>--------<
7+
0| Map<int, int> foo;

‎data/fixtures/scopes/java/type.typeArgument.scope‎

Lines changed: 36 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,52 @@
1-
class MyClass {
2-
Map<int, int> foo;
3-
}
1+
Map<int, int> foo;
42
---
53

6-
[#1 Content] =
7-
[#1 Removal] =
8-
[#1 Domain] = 0:0-2:1
9-
>---------------
10-
0| class MyClass {
11-
1| Map<int, int> foo;
12-
2| }
13-
-<
4+
[#1 Content] = 0:0-0:13
5+
>-------------<
6+
0| Map<int, int> foo;
147

15-
[#1 Insertion delimiter] = " "
16-
17-
18-
[#2 Content] = 1:4-1:17
19-
>-------------<
20-
1| Map<int, int> foo;
8+
[#1 Removal] = 0:0-0:14
9+
>--------------<
10+
0| Map<int, int> foo;
2111

22-
[#2 Removal] = 1:4-1:18
23-
>--------------<
24-
1| Map<int, int> foo;
12+
[#1 Trailing delimiter] = 0:13-0:14
13+
>-<
14+
0| Map<int, int> foo;
2515

26-
[#2 Leading delimiter] = 1:0-1:4
27-
>----<
28-
1| Map<int, int> foo;
16+
[#1 Domain] = 0:0-0:18
17+
>------------------<
18+
0| Map<int, int> foo;
2919

30-
[#2 Trailing delimiter] = 1:17-1:18
31-
>-<
32-
1| Map<int, int> foo;
20+
[#1 Insertion delimiter] = " "
3321

34-
[#2 Domain] = 1:4-1:22
35-
>------------------<
36-
1| Map<int, int> foo;
3722

38-
[#2 Insertion delimiter] = " "
23+
[#2 Content] =
24+
[#2 Domain] = 0:4-0:7
25+
>---<
26+
0| Map<int, int> foo;
3927

28+
[#2 Removal] = 0:4-0:9
29+
>-----<
30+
0| Map<int, int> foo;
4031

41-
[#3 Content] =
42-
[#3 Removal] =
43-
[#3 Domain] = 1:8-1:11
44-
>---<
45-
1| Map<int, int> foo;
32+
[#2 Trailing delimiter] = 0:7-0:9
33+
>--<
34+
0| Map<int, int> foo;
4635

47-
[#3 Insertion delimiter] = " "
36+
[#2 Insertion delimiter] = ", "
4837

4938

50-
[#4 Content] =
51-
[#4 Domain] = 1:13-1:16
52-
>---<
53-
1| Map<int, int> foo;
39+
[#3 Content] =
40+
[#3 Domain] = 0:9-0:12
41+
>---<
42+
0| Map<int, int> foo;
5443

55-
[#4 Removal] = 1:12-1:16
56-
>----<
57-
1| Map<int, int> foo;
44+
[#3 Removal] = 0:7-0:12
45+
>-----<
46+
0| Map<int, int> foo;
5847

59-
[#4 Leading delimiter] = 1:12-1:13
60-
>-<
61-
1| Map<int, int> foo;
48+
[#3 Leading delimiter] = 0:7-0:9
49+
>--<
50+
0| Map<int, int> foo;
6251

63-
[#4 Insertion delimiter] = " "
52+
[#3 Insertion delimiter] = ", "

‎data/fixtures/scopes/python/class2.scope‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@value
2+
class MyClass:
3+
pass
4+
---
5+
6+
[Content] =
7+
[Removal] =
8+
[Domain] = 0:0-2:8
9+
>------
10+
0| @value
11+
1| class MyClass:
12+
2| pass
13+
--------<
14+
15+
[Insertion delimiter] = "\n\n"

‎data/fixtures/scopes/python/type.argument.formal.constructor.iteration.scope‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
class MyClass:
2+
def __init__(self, a: int):
3+
pass
4+
---
5+
6+
[#1 Range] =
7+
[#1 Domain] = 1:4-2:12
8+
>---------------------------
9+
1| def __init__(self, a: int):
10+
2| pass
11+
------------<
12+
13+
14+
[#2 Range] =
15+
[#2 Domain] = 1:17-1:29
16+
>------------<
17+
1| def __init__(self, a: int):
18+
19+
20+
[#3 Range] =
21+
[#3 Domain] = 2:8-2:12
22+
>----<
23+
2| pass

‎data/fixtures/scopes/python/type.argument.formal.constructor.scope‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
class MyClass:
2+
def __init__(self, a: int):
3+
pass
4+
---
5+
6+
[#1 Content] =
7+
[#1 Removal] =
8+
[#1 Domain] = 0:0-2:12
9+
>--------------
10+
0| class MyClass:
11+
1| def __init__(self, a: int):
12+
2| pass
13+
------------<
14+
15+
[#1 Insertion delimiter] = " "
16+
17+
18+
[#2 Content] = 1:26-1:29
19+
>---<
20+
1| def __init__(self, a: int):
21+
22+
[#2 Removal] = 1:24-1:29
23+
>-----<
24+
1| def __init__(self, a: int):
25+
26+
[#2 Leading delimiter] = 1:24-1:26
27+
>--<
28+
1| def __init__(self, a: int):
29+
30+
[#2 Domain] = 1:23-1:29
31+
>------<
32+
1| def __init__(self, a: int):
33+
34+
[#2 Insertion delimiter] = " "

‎data/fixtures/scopes/python/type.argument.formal.iteration.scope‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
def funk(a: int):
2+
pass
3+
---
4+
5+
[#1 Range] =
6+
[#1 Domain] = 0:9-0:15
7+
>------<
8+
0| def funk(a: int):
9+
10+
11+
[#2 Range] =
12+
[#2 Domain] = 1:4-1:8
13+
>----<
14+
1| pass

0 commit comments

Comments
 (0)