Skip to content

Commit b8b5af5

Browse files
author
fidgetingbits
committed
basic branch support and tests
1 parent 4c0a6a3 commit b8b5af5

File tree

6 files changed

+526
-19
lines changed

6 files changed

+526
-19
lines changed

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeBranch.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change branch
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: branch}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
key = if a then b else c;
17+
key =
18+
if a
19+
then b
20+
else c;
21+
22+
a = b; # Inline comment (test)
23+
b = c; # Inline comment 2
24+
a = 1 + 1;
25+
a = a/b/c ? 0;
26+
a = b: b + 1;
27+
28+
foo = let
29+
a = b;
30+
c = d;
31+
in
32+
{
33+
output = b;
34+
};
35+
36+
bar = let
37+
a = 1;
38+
b = 2;
39+
in a + b;
40+
41+
bar =
42+
with key;
43+
let
44+
a = key;
45+
in
46+
a;
47+
48+
a = x: x + 1;
49+
b = x: y: x + y + 1;
50+
}
51+
selections:
52+
- anchor: {line: 1, character: 10}
53+
active: {line: 1, character: 10}
54+
marks: {}
55+
finalState:
56+
documentContents: |
57+
{
58+
key = then b else c;
59+
key =
60+
if a
61+
then b
62+
else c;
63+
64+
a = b; # Inline comment (test)
65+
b = c; # Inline comment 2
66+
a = 1 + 1;
67+
a = a/b/c ? 0;
68+
a = b: b + 1;
69+
70+
foo = let
71+
a = b;
72+
c = d;
73+
in
74+
{
75+
output = b;
76+
};
77+
78+
bar = let
79+
a = 1;
80+
b = 2;
81+
in a + b;
82+
83+
bar =
84+
with key;
85+
let
86+
a = key;
87+
in
88+
a;
89+
90+
a = x: x + 1;
91+
b = x: y: x + y + 1;
92+
}
93+
selections:
94+
- anchor: {line: 1, character: 8}
95+
active: {line: 1, character: 8}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeBranch2.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change branch
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: branch}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
key = if a then b else c;
17+
key =
18+
if a
19+
then b
20+
else c;
21+
22+
a = b; # Inline comment (test)
23+
b = c; # Inline comment 2
24+
a = 1 + 1;
25+
a = a/b/c ? 0;
26+
a = b: b + 1;
27+
28+
foo = let
29+
a = b;
30+
c = d;
31+
in
32+
{
33+
output = b;
34+
};
35+
36+
bar = let
37+
a = 1;
38+
b = 2;
39+
in a + b;
40+
41+
bar =
42+
with key;
43+
let
44+
a = key;
45+
in
46+
a;
47+
48+
a = x: x + 1;
49+
b = x: y: x + y + 1;
50+
}
51+
selections:
52+
- anchor: {line: 1, character: 17}
53+
active: {line: 1, character: 17}
54+
marks: {}
55+
finalState:
56+
documentContents: |
57+
{
58+
key = if a else c;
59+
key =
60+
if a
61+
then b
62+
else c;
63+
64+
a = b; # Inline comment (test)
65+
b = c; # Inline comment 2
66+
a = 1 + 1;
67+
a = a/b/c ? 0;
68+
a = b: b + 1;
69+
70+
foo = let
71+
a = b;
72+
c = d;
73+
in
74+
{
75+
output = b;
76+
};
77+
78+
bar = let
79+
a = 1;
80+
b = 2;
81+
in a + b;
82+
83+
bar =
84+
with key;
85+
let
86+
a = key;
87+
in
88+
a;
89+
90+
a = x: x + 1;
91+
b = x: y: x + y + 1;
92+
}
93+
selections:
94+
- anchor: {line: 1, character: 13}
95+
active: {line: 1, character: 13}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeBranch3.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change branch
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: branch}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
key = if a then b else c;
17+
key =
18+
if a
19+
then b
20+
else c;
21+
22+
a = b; # Inline comment (test)
23+
b = c; # Inline comment 2
24+
a = 1 + 1;
25+
a = a/b/c ? 0;
26+
a = b: b + 1;
27+
28+
foo = let
29+
a = b;
30+
c = d;
31+
in
32+
{
33+
output = b;
34+
};
35+
36+
bar = let
37+
a = 1;
38+
b = 2;
39+
in a + b;
40+
41+
bar =
42+
with key;
43+
let
44+
a = key;
45+
in
46+
a;
47+
48+
a = x: x + 1;
49+
b = x: y: x + y + 1;
50+
}
51+
selections:
52+
- anchor: {line: 1, character: 22}
53+
active: {line: 1, character: 22}
54+
marks: {}
55+
finalState:
56+
documentContents: |
57+
{
58+
key = if a then b ;
59+
key =
60+
if a
61+
then b
62+
else c;
63+
64+
a = b; # Inline comment (test)
65+
b = c; # Inline comment 2
66+
a = 1 + 1;
67+
a = a/b/c ? 0;
68+
a = b: b + 1;
69+
70+
foo = let
71+
a = b;
72+
c = d;
73+
in
74+
{
75+
output = b;
76+
};
77+
78+
bar = let
79+
a = 1;
80+
b = 2;
81+
in a + b;
82+
83+
bar =
84+
with key;
85+
let
86+
a = key;
87+
in
88+
a;
89+
90+
a = x: x + 1;
91+
b = x: y: x + y + 1;
92+
}
93+
selections:
94+
- anchor: {line: 1, character: 20}
95+
active: {line: 1, character: 20}

‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeBranch4.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change branch
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: branch}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
key = if a then b else c;
17+
key =
18+
if a
19+
then b
20+
else c;
21+
22+
a = b; # Inline comment (test)
23+
b = c; # Inline comment 2
24+
a = 1 + 1;
25+
a = a/b/c ? 0;
26+
a = b: b + 1;
27+
28+
foo = let
29+
a = b;
30+
c = d;
31+
in
32+
{
33+
output = b;
34+
};
35+
36+
bar = let
37+
a = 1;
38+
b = 2;
39+
in a + b;
40+
41+
bar =
42+
with key;
43+
let
44+
a = key;
45+
in
46+
a;
47+
48+
a = x: x + 1;
49+
b = x: y: x + y + 1;
50+
}
51+
selections:
52+
- anchor: {line: 5, character: 6}
53+
active: {line: 5, character: 6}
54+
marks: {}
55+
finalState:
56+
documentContents: |
57+
{
58+
key = if a then b else c;
59+
key =
60+
if a
61+
then b
62+
;
63+
64+
a = b; # Inline comment (test)
65+
b = c; # Inline comment 2
66+
a = 1 + 1;
67+
a = a/b/c ? 0;
68+
a = b: b + 1;
69+
70+
foo = let
71+
a = b;
72+
c = d;
73+
in
74+
{
75+
output = b;
76+
};
77+
78+
bar = let
79+
a = 1;
80+
b = 2;
81+
in a + b;
82+
83+
bar =
84+
with key;
85+
let
86+
a = key;
87+
in
88+
a;
89+
90+
a = x: x + 1;
91+
b = x: y: x + y + 1;
92+
}
93+
selections:
94+
- anchor: {line: 5, character: 4}
95+
active: {line: 5, character: 4}

0 commit comments

Comments
 (0)