Skip to content

Commit 9ea7601

Browse files
author
fidgetingbits
committed
Fix call argument handling and support inherit keyword
1 parent 7136a10 commit 9ea7601

16 files changed

+569
-2
lines changed

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeArg3.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change arg
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: argumentOrParameter}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |-
15+
{
16+
outputs = { self, nixpkgs, home-manager }:
17+
"foo"
18+
}
19+
selections:
20+
- anchor: {line: 1, character: 13}
21+
active: {line: 1, character: 13}
22+
marks: {}
23+
finalState:
24+
documentContents: |-
25+
{
26+
outputs = :
27+
"foo"
28+
}
29+
selections:
30+
- anchor: {line: 1, character: 12}
31+
active: {line: 1, character: 12}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeArg4.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change arg
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: argumentOrParameter}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 35}
20+
active: {line: 1, character: 35}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = mkFunc "a" "b" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 33}
29+
active: {line: 1, character: 33}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeArg5.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change arg
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: argumentOrParameter}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a";
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 26}
20+
active: {line: 1, character: 26}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = mkFunc ;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 25}
29+
active: {line: 1, character: 25}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeArgPit.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change arg pit
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
mark: {type: decoratedSymbol, symbolColor: default, character: p}
10+
modifiers:
11+
- type: containingScope
12+
scopeType: {type: argumentOrParameter}
13+
usePrePhraseSnapshot: true
14+
initialState:
15+
documentContents: |
16+
{
17+
inherit pkgs input output;
18+
}
19+
selections:
20+
- anchor: {line: 1, character: 17}
21+
active: {line: 1, character: 17}
22+
marks:
23+
default.p:
24+
start: {line: 1, character: 10}
25+
end: {line: 1, character: 14}
26+
finalState:
27+
documentContents: |
28+
{
29+
inherit input output;
30+
}
31+
selections:
32+
- anchor: {line: 1, character: 10}
33+
active: {line: 1, character: 10}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCall2.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change call
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCall}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 25}
20+
active: {line: 1, character: 25}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = ;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee2.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 28}
20+
active: {line: 1, character: 28}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a" "b" "c" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee3.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 32}
20+
active: {line: 1, character: 32}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a" "b" "c" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee4.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 36}
20+
active: {line: 1, character: 36}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a" "b" "c" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee5.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 38}
20+
active: {line: 1, character: 38}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a" "b" "c" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee6.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a" "b" "c" d e;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 40}
20+
active: {line: 1, character: 40}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a" "b" "c" d e;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee7.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
exampleHost = mkFunc "a";
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 26}
20+
active: {line: 1, character: 26}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
exampleHost = "a";
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 18}
29+
active: {line: 1, character: 18}

Diff for: ‎packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeCallee8.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
languageId: nix
2+
command:
3+
version: 6
4+
spokenForm: change callee
5+
action:
6+
name: clearAndSetSelection
7+
target:
8+
type: primitive
9+
modifiers:
10+
- type: containingScope
11+
scopeType: {type: functionCallee}
12+
usePrePhraseSnapshot: true
13+
initialState:
14+
documentContents: |
15+
{
16+
inherit pkgs input output;
17+
}
18+
selections:
19+
- anchor: {line: 1, character: 17}
20+
active: {line: 1, character: 17}
21+
marks: {}
22+
finalState:
23+
documentContents: |
24+
{
25+
pkgs input output;
26+
}
27+
selections:
28+
- anchor: {line: 1, character: 2}
29+
active: {line: 1, character: 2}

0 commit comments

Comments
 (0)