Skip to content

Commit 400e8fc

Browse files
AndreasArvidssonAndreasArvidsson
committed
Merge branch 'main' into argumentList
2 parents 467da18 + fbfb7aa commit 400e8fc

File tree

68 files changed

+1430
-52
lines changed

Some content is hidden

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

68 files changed

+1430
-52
lines changed

‎cursorless-talon-dev/src/cursorless_test.talon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ test api extract decorated marks <user.cursorless_target>:
3232
test api alternate highlight nothing:
3333
user.private_cursorless_test_alternate_highlight_nothing()
3434

35-
test api parsed: user.cursorless_custom_command("chuck block")
35+
test api parsed: user.cursorless_x_custom_command("chuck block")
3636
test api parsed <user.cursorless_target>:
37-
user.cursorless_custom_command("chuck block <target>", cursorless_target)
37+
user.cursorless_x_custom_command("chuck block <target>", cursorless_target)
3838
test api parsed <user.cursorless_target> plus <user.cursorless_target>:
39-
user.cursorless_custom_command("bring block <target1> after <target2>", cursorless_target_1, cursorless_target_2)
39+
user.cursorless_x_custom_command("bring block <target1> after <target2>", cursorless_target_1, cursorless_target_2)

‎cursorless-talon/src/public_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def cursorless_create_destination(
2626

2727
@mod.action_class
2828
class CommandActions:
29-
def cursorless_custom_command(
29+
def cursorless_x_custom_command(
3030
content: str, # pyright: ignore [reportGeneralTypeIssues]
3131
arg1: Optional[Any] = None,
3232
arg2: Optional[Any] = None,

‎cursorless-talon/src/spoken_forms.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
},
232232
"experimental/experimental_actions.csv": {
233233
"experimental_action": {
234-
"-from": "experimental.setInstanceReference"
234+
"from": "experimental.setInstanceReference"
235235
}
236236
},
237237
"experimental/wrapper_snippets.csv": {},

‎data/fixtures/scopes/csharp/argument.formal.lambda.iteration.scope‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
(a, b) => {}
2+
---
3+
4+
[Range] = 0:1-0:5
5+
>----<
6+
0| (a, b) => {}
7+
8+
[Domain] = 0:0-0:12
9+
>------------<
10+
0| (a, b) => {}

‎data/fixtures/scopes/csharp/argument.formal.lambda.scope‎

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

‎data/fixtures/scopes/csharp/comment.block.scope‎

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

‎data/fixtures/scopes/csharp/comment.line.scope‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Hello world
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:14
7+
>--------------<
8+
0| // Hello world
9+
10+
[Insertion delimiter] = "\n"

‎data/fixtures/scopes/csharp/name.argument.formal.constructor.iteration.scope‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
class MyClass {
2+
MyClass(int foo, int bar) {}
3+
}
4+
---
5+
6+
[#1 Range] =
7+
[#1 Domain] = 0:0-2:1
8+
>---------------
9+
0| class MyClass {
10+
1| MyClass(int foo, int bar) {}
11+
2| }
12+
-<
13+
14+
15+
[#2 Range] =
16+
[#2 Domain] = 0:15-2:0
17+
>
18+
0| class MyClass {
19+
1| MyClass(int foo, int bar) {}
20+
2| }
21+
<
22+
23+
24+
[#3 Range] =
25+
[#3 Domain] = 1:12-1:28
26+
>----------------<
27+
1| MyClass(int foo, int bar) {}
28+
29+
30+
[#4 Range] =
31+
[#4 Domain] = 1:31-1:31
32+
><
33+
1| MyClass(int foo, int bar) {}

‎data/fixtures/scopes/csharp/name.argument.formal.constructor.scope‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
class MyClass {
2+
MyClass(int foo) {}
3+
}
4+
---
5+
6+
[#1 Content] = 0:6-0:13
7+
>-------<
8+
0| class MyClass {
9+
10+
[#1 Removal] = 0:6-0:14
11+
>--------<
12+
0| class MyClass {
13+
14+
[#1 Leading delimiter] = 0:5-0:6
15+
>-<
16+
0| class MyClass {
17+
18+
[#1 Trailing delimiter] = 0:13-0:14
19+
>-<
20+
0| class MyClass {
21+
22+
[#1 Domain] = 0:0-2:1
23+
>---------------
24+
0| class MyClass {
25+
1| MyClass(int foo) {}
26+
2| }
27+
-<
28+
29+
[#1 Insertion delimiter] = " "
30+
31+
32+
[#2 Content] =
33+
[#2 Removal] = 1:4-1:11
34+
>-------<
35+
1| MyClass(int foo) {}
36+
37+
[#2 Leading delimiter] = 1:0-1:4
38+
>----<
39+
1| MyClass(int foo) {}
40+
41+
[#2 Domain] = 1:4-1:23
42+
>-------------------<
43+
1| MyClass(int foo) {}
44+
45+
[#2 Insertion delimiter] = " "
46+
47+
48+
[#3 Content] = 1:16-1:19
49+
>---<
50+
1| MyClass(int foo) {}
51+
52+
[#3 Removal] = 1:15-1:19
53+
>----<
54+
1| MyClass(int foo) {}
55+
56+
[#3 Leading delimiter] = 1:15-1:16
57+
>-<
58+
1| MyClass(int foo) {}
59+
60+
[#3 Domain] = 1:12-1:19
61+
>-------<
62+
1| MyClass(int foo) {}
63+
64+
[#3 Insertion delimiter] = " "

‎data/fixtures/scopes/csharp/name.argument.formal.iteration.scope‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ void myFunk(String name, int value) {}
22
---
33

44
[#1 Range] =
5-
[#1 Domain] = 0:12-0:34
6-
>----------------------<
5+
[#1 Domain] = 0:0-0:38
6+
>--------------------------------------<
77
0| void myFunk(String name, int value) {}
88

99

1010
[#2 Range] =
11-
[#2 Domain] = 0:37-0:37
11+
[#2 Domain] = 0:12-0:34
12+
>----------------------<
13+
0| void myFunk(String name, int value) {}
14+
15+
16+
[#3 Range] =
17+
[#3 Domain] = 0:37-0:37
1218
><
1319
0| void myFunk(String name, int value) {}

0 commit comments

Comments
 (0)