Skip to content

Commit bae9ce0

Browse files
authored
Fix interior scope tests (#2218)
## Checklist - [x] 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
1 parent aed028e commit bae9ce0

File tree

5 files changed

+49
-12
lines changed

5 files changed

+49
-12
lines changed

packages/cursorless-engine/src/scopeProviders/getTargetRanges.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
NoContainingScopeError,
23
TargetRanges,
34
toCharacterRange,
45
toLineRange,
@@ -8,17 +9,23 @@ import { Target } from "../typings/target.types";
89
export function getTargetRanges(target: Target): TargetRanges {
910
const interior = (() => {
1011
try {
11-
target.getInteriorStrict().map(getTargetRanges);
12+
return target.getInteriorStrict().map(getTargetRanges);
1213
} catch (error) {
13-
return undefined;
14+
if (error instanceof NoContainingScopeError) {
15+
return undefined;
16+
}
17+
throw error;
1418
}
1519
})();
1620

1721
const boundary = (() => {
1822
try {
19-
target.getBoundaryStrict().map(getTargetRanges);
23+
return target.getBoundaryStrict().map(getTargetRanges);
2024
} catch (error) {
21-
return undefined;
25+
if (error instanceof NoContainingScopeError) {
26+
return undefined;
27+
}
28+
throw error;
2229
}
2330
})();
2431

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@
77
0| <div id="root"></div>
88
>---------------------<
99

10+
[Interior] = 0:15-0:15
11+
0| <div id="root"></div>
12+
><
13+
1014
[Insertion delimiter] = "\n"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@
77
0| <div id="root"></div>
88
>---------------------<
99

10+
[Interior] = 0:15-0:15
11+
0| <div id="root"></div>
12+
><
13+
1014
[Insertion delimiter] = "\n"

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/talon/command.scope

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ press {user.key}:
1010
1| key(key)
1111
------------<
1212

13+
[Interior] = 1:4-1:12
14+
1| key(key)
15+
>--------<
16+
1317
[Insertion delimiter] = "\n"
Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
1-
aaa
1+
2+
aaa
23

34
bbb
45

56
ccc
7+
68
---
79

810
[Content] =
911
[Removal] =
10-
[Domain] = 0:0-4:3
11-
0| aaa
12-
>---
13-
1|
12+
[Domain] = 0:0-6:0
13+
0|
14+
>
15+
1| aaa
16+
-----
17+
2|
18+
19+
3| bbb
20+
---
21+
4|
22+
23+
5| ccc
24+
---
25+
6|
26+
<
27+
28+
[Interior] = 1:2-5:3
29+
1| aaa
30+
>---
31+
2|
1432

15-
2| bbb
33+
3| bbb
1634
---
17-
3|
35+
4|
1836

19-
4| ccc
37+
5| ccc
2038
---<
2139

2240
[Insertion delimiter] = "\n"

0 commit comments

Comments
 (0)