Skip to content

Commit 76be55e

Browse files
AndreasArvidssonpokey
AndreasArvidsson
and
pokey
authored
Simplify scope fixtures (#2238)
Fixes #2210 ## Checklist - [/] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [/] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [/] I have not broken the cheatsheet --------- Co-authored-by: Pokey Rule <[email protected]>
1 parent aaf645a commit 76be55e

File tree

120 files changed

+466
-540
lines changed

Some content is hidden

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

120 files changed

+466
-540
lines changed

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/attribute.scope

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
[Content] =
55
[Domain] = 0:5-0:14
6-
0| <div id="root"></div>
76
>---------<
7+
0| <div id="root"></div>
88

99
[Removal] = 0:4-0:14
10-
0| <div id="root"></div>
1110
>----------<
11+
0| <div id="root"></div>
1212

1313
[Leading delimiter] = 0:4-0:5
14-
0| <div id="root"></div>
1514
>-<
15+
0| <div id="root"></div>
1616

1717
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/comment.block.scope

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
[Content] =
77
[Removal] =
88
[Domain] = 0:0-2:3
9-
0| <!--
109
>----
10+
0| <!--
1111
1| Hello world
12-
--------------
1312
2| -->
1413
---<
1514

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/element.scope

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
[Content] =
55
[Removal] =
66
[Domain] = 0:0-0:21
7-
0| <div id="root"></div>
87
>---------------------<
8+
0| <div id="root"></div>
99

1010
[Interior] = 0:15-0:15
11-
0| <div id="root"></div>
1211
><
12+
0| <div id="root"></div>
1313

1414
[Insertion delimiter] = "\n"

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/endTag.scope

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
[Content] =
55
[Removal] = 0:15-0:21
6-
0| <div id="root"></div>
76
>------<
7+
0| <div id="root"></div>
88

99
[Domain] = 0:0-0:21
10-
0| <div id="root"></div>
1110
>---------------------<
11+
0| <div id="root"></div>
1212

1313
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute.scope

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
---
33

44
[Content] = 0:5-0:7
5-
0| <div id="root"></div>
65
>--<
6+
0| <div id="root"></div>
77

88
[Removal] = 0:5-0:8
9-
0| <div id="root"></div>
109
>---<
10+
0| <div id="root"></div>
1111

1212
[Trailing delimiter] = 0:7-0:8
13-
0| <div id="root"></div>
1413
>-<
14+
0| <div id="root"></div>
1515

1616
[Domain] = 0:5-0:14
17-
0| <div id="root"></div>
1817
>---------<
18+
0| <div id="root"></div>
1919

2020
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/key.attribute2.scope

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
[Content] =
55
[Domain] = 0:5-0:13
6-
0| <div disabled></div>
76
>--------<
7+
0| <div disabled></div>
88

99
[Removal] = 0:4-0:13
10-
0| <div disabled></div>
1110
>---------<
11+
0| <div disabled></div>
1212

1313
[Leading delimiter] = 0:4-0:5
14-
0| <div disabled></div>
1514
>-<
15+
0| <div disabled></div>
1616

1717
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/startTag.scope

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
[Content] =
55
[Removal] = 0:0-0:15
6-
0| <div id="root"></div>
76
>---------------<
7+
0| <div id="root"></div>
88

99
[Domain] = 0:0-0:21
10-
0| <div id="root"></div>
1110
>---------------------<
11+
0| <div id="root"></div>
1212

1313
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/tags.scope

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
[.1 Content] =
55
[.1 Removal] = 0:0-0:5
6-
0| <div>hello</div>
76
>-----<
7+
0| <div>hello</div>
88

99
[.1 Insertion delimiter] = " "
1010

1111
[.2 Content] =
1212
[.2 Removal] = 0:10-0:16
13-
0| <div>hello</div>
1413
>------<
14+
0| <div>hello</div>
1515

1616
[.2 Insertion delimiter] = " "
1717

1818
[Domain] = 0:0-0:16
19-
0| <div>hello</div>
2019
>----------------<
20+
0| <div>hello</div>

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/html/value.attribute.scope

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
---
33

44
[Content] = 0:8-0:14
5-
0| <div id="root"></div>
65
>------<
6+
0| <div id="root"></div>
77

88
[Removal] = 0:7-0:14
9-
0| <div id="root"></div>
109
>-------<
10+
0| <div id="root"></div>
1111

1212
[Leading delimiter] = 0:7-0:8
13-
0| <div id="root"></div>
1413
>-<
14+
0| <div id="root"></div>
1515

1616
[Domain] = 0:5-0:14
17-
0| <div id="root"></div>
1817
>---------<
18+
0| <div id="root"></div>
1919

2020
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/name.foreach.scope

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,25 @@ for (final Item item : items) {
44
---
55

66
[Content] = 0:16-0:20
7-
0| for (final Item item : items) {
87
>----<
8+
0| for (final Item item : items) {
99

1010
[Removal] = 0:16-0:21
11-
0| for (final Item item : items) {
1211
>-----<
12+
0| for (final Item item : items) {
1313

1414
[Leading delimiter] = 0:15-0:16
15-
0| for (final Item item : items) {
1615
>-<
16+
0| for (final Item item : items) {
1717

1818
[Trailing delimiter] = 0:20-0:21
19-
0| for (final Item item : items) {
2019
>-<
20+
0| for (final Item item : items) {
2121

2222
[Domain] = 0:0-2:1
23-
0| for (final Item item : items) {
2423
>-------------------------------
24+
0| for (final Item item : items) {
2525
1|
26-
2726
2| }
2827
-<
2928

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/type.foreach.scope

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,25 @@ for (final Item item : items) {
44
---
55

66
[Content] = 0:11-0:15
7-
0| for (final Item item : items) {
87
>----<
8+
0| for (final Item item : items) {
99

1010
[Removal] = 0:11-0:16
11-
0| for (final Item item : items) {
1211
>-----<
12+
0| for (final Item item : items) {
1313

1414
[Leading delimiter] = 0:10-0:11
15-
0| for (final Item item : items) {
1615
>-<
16+
0| for (final Item item : items) {
1717

1818
[Trailing delimiter] = 0:15-0:16
19-
0| for (final Item item : items) {
2019
>-<
20+
0| for (final Item item : items) {
2121

2222
[Domain] = 0:0-2:1
23-
0| for (final Item item : items) {
2423
>-------------------------------
24+
0| for (final Item item : items) {
2525
1|
26-
2726
2| }
2827
-<
2928

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/java/value.foreach.scope

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ for (final Item item : items) {
44
---
55

66
[Content] = 0:23-0:28
7-
0| for (final Item item : items) {
87
>-----<
8+
0| for (final Item item : items) {
99

1010
[Removal] = 0:22-0:28
11-
0| for (final Item item : items) {
1211
>------<
12+
0| for (final Item item : items) {
1313

1414
[Leading delimiter] = 0:22-0:23
15-
0| for (final Item item : items) {
1615
>-<
16+
0| for (final Item item : items) {
1717

1818
[Domain] = 0:0-2:1
19-
0| for (final Item item : items) {
2019
>-------------------------------
20+
0| for (final Item item : items) {
2121
1|
22-
2322
2| }
2423
-<
2524

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction.scope

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ function() {
66
[Content] =
77
[Removal] =
88
[Domain] = 0:0-2:1
9-
0| function() {
109
>------------
10+
0| function() {
1111
1|
12-
1312
2| }
1413
-<
1514

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction2.scope

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
[Content] =
77
[Removal] =
88
[Domain] = 0:0-2:1
9-
0| () => {
109
>-------
10+
0| () => {
1111
1|
12-
1312
2| }
1413
-<
1514

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/anonymousFunction3.scope

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[Content] =
55
[Removal] =
66
[Domain] = 0:0-0:7
7-
0| () => 0
87
>-------<
8+
0| () => 0
99

1010
[Insertion delimiter] = "\n"

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.iteration.scope

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ foo(arg1, arg2);
22
---
33

44
[Range] = 0:4-0:14
5-
0| foo(arg1, arg2);
65
>----------<
6+
0| foo(arg1, arg2);
77

88
[Domain] = 0:3-0:15
9-
0| foo(arg1, arg2);
109
>------------<
10+
0| foo(arg1, arg2);

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.actual.scope

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ foo.bar(value);
44
[Content] =
55
[Removal] =
66
[Domain] = 0:8-0:13
7-
0| foo.bar(value);
87
>-----<
8+
0| foo.bar(value);
99

1010
[Insertion delimiter] = ", "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.iteration.scope

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ function myFunk(arg1, arg2) {
44
---
55

66
[Range] = 0:16-0:26
7-
0| function myFunk(arg1, arg2) {
87
>----------<
8+
0| function myFunk(arg1, arg2) {
99

1010
[Domain] = 0:0-2:1
11-
0| function myFunk(arg1, arg2) {
1211
>-----------------------------
12+
0| function myFunk(arg1, arg2) {
1313
1|
14-
1514
2| }
1615
-<

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/argument.formal.scope

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function myFunk(value) {
66
[Content] =
77
[Removal] =
88
[Domain] = 0:16-0:21
9-
0| function myFunk(value) {
109
>-----<
10+
0| function myFunk(value) {
1111

1212
[Insertion delimiter] = ", "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/attribute.scope

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
[Content] =
55
[Domain] = 0:5-0:14
6-
0| <div id="root"></div>
76
>---------<
7+
0| <div id="root"></div>
88

99
[Removal] = 0:4-0:14
10-
0| <div id="root"></div>
1110
>----------<
11+
0| <div id="root"></div>
1212

1313
[Leading delimiter] = 0:4-0:5
14-
0| <div id="root"></div>
1514
>-<
15+
0| <div id="root"></div>
1616

1717
[Insertion delimiter] = " "

‎packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/branch.if.iteration.scope

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,14 @@ else {
1111

1212
[Range] =
1313
[Domain] = 0:0-8:1
14-
0| if (true) {
1514
>-----------
15+
0| if (true) {
1616
1|
17-
1817
2| }
19-
-
2018
3| else if (false) {
21-
-----------------
2219
4|
23-
2420
5| }
25-
-
2621
6| else {
27-
------
2822
7|
29-
3023
8| }
3124
-<

0 commit comments

Comments
 (0)