Skip to content

Added prefix range to scope fixtures #3374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreasArvidsson merged 1 commit into from
Oct 2, 2026
+56 −0
Merged

Added prefix range to scope fixtures #3374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/lib-common/src/types/ScopeProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ export interface TargetRanges {
contentRange: Range;
removalRange: Range;
removalHighlightRange: GeneralizedRange;
prefixRange: Range | undefined;
leadingDelimiter: TargetRanges | undefined;
trailingDelimiter: TargetRanges | undefined;
interior: TargetRanges[] | undefined;
Expand Down
1 change: 1 addition & 0 deletions packages/lib-engine/src/scopeProviders/getTargetRanges.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export function getTargetRanges(target: Target): TargetRanges {
contentRange: target.contentRange,
removalRange: target.getRemovalRange(),
removalHighlightRange: target.getRemovalHighlightRange(),
prefixRange: target.prefixRange,
leadingDelimiter: getOptionalTarget(target.getLeadingDelimiterTarget()),
trailingDelimiter: getOptionalTarget(target.getTrailingDelimiterTarget()),
interior: target.getInterior()?.map(getTargetRanges),
Expand Down
13 changes: 13 additions & 0 deletions packages/lib-engine/src/testUtil/serializeScopeFixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,19 @@ function serializeTarget({
lines.push(serializeTargetRange(codeLines, group.range));
}

if (target.prefixRange != null) {
lines.push(
"",
serializeHeader({
header: "Prefix",
scopeNumber,
targetNumber,
range: target.prefixRange,
}),
serializeTargetRange(codeLines, target.prefixRange),
);
}

if (target.leadingDelimiter != null) {
lines.push(
serializeTargetCompact({
Expand Down
1 change: 1 addition & 0 deletions packages/tool-meta-updater/src/updateScopeFixtureData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ function parseTest(test: ScopeTestPath): ScopeFixtureData {
case "Removal":
currentTarget.removal = value;
break;
case "Prefix":
case "Insertion delimiter":
case "Leading delimiter":
case "Leading delimiter: Content":
Expand Down
12 changes: 12 additions & 0 deletions resources/fixtures/scopes/markdown/collectionItem.unenclosed.multiLine.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
2| - This is the first level of a list again.
<

[#1 Prefix] = 0:0-0:2
>--<
0| - This is the first level of a list.

[#1 Trailing delimiter] = 1:39-2:0
>
1| - This is the second level of a list.
Expand All @@ -41,6 +45,10 @@
2| - This is the first level of a list again.
<

[#2 Prefix] = 1:2-1:4
>--<
1| - This is the second level of a list.

[#2 Leading delimiter] = 1:0-1:2
>--<
1| - This is the second level of a list.
Expand All @@ -62,6 +70,10 @@
2| - This is the first level of a list again.
------------------------------------------<

[#3 Prefix] = 2:0-2:2
>--<
2| - This is the first level of a list again.

[#3 Leading delimiter] = 1:39-2:0
>
1| - This is the second level of a list.
Expand Down
8 changes: 8 additions & 0 deletions resources/fixtures/scopes/markdown/collectionItem.unenclosed.multiLine2.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
2| - Second item
<

[#1 Prefix] = 0:0-0:2
>--<
0| - First item

[#1 Trailing delimiter] = 1:11-2:0
>
1| Paragraph
Expand All @@ -41,6 +45,10 @@
2| - Second item
-------------<

[#2 Prefix] = 2:0-2:2
>--<
2| - Second item

[#2 Leading delimiter] = 1:11-2:0
>
1| Paragraph
Expand Down
8 changes: 8 additions & 0 deletions resources/fixtures/scopes/markdown/collectionItem.unenclosed.multiLine3.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
1| - [ ] Second item
<

[#1 Prefix] = 0:0-0:2
>--<
0| - [ ] First item

[#1 Trailing delimiter] = 0:16-1:0
>
0| - [ ] First item
Expand Down Expand Up @@ -44,6 +48,10 @@
1| - [ ] Second item
-----------------<

[#3 Prefix] = 1:0-1:2
>--<
1| - [ ] Second item

[#3 Leading delimiter] = 0:16-1:0
>
0| - [ ] First item
Expand Down
12 changes: 12 additions & 0 deletions resources/fixtures/scopes/yaml/collectionItem.unenclosed.multiLine.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ items:
2| - 2
--<

[#2 Prefix] = 1:2-1:4
>--<
1| - 1

[#2 Trailing delimiter] = 1:5-2:2
>
1| - 1
Expand All @@ -50,6 +54,10 @@ items:
3| - 3
--<

[#3 Prefix] = 2:2-2:4
>--<
2| - 2

[#3 Leading delimiter] = 1:5-2:2
>
1| - 1
Expand Down Expand Up @@ -79,6 +87,10 @@ items:
3| - 3
-----<

[#4 Prefix] = 3:2-3:4
>--<
3| - 3

[#4 Leading delimiter] = 2:5-3:2
>
2| - 2
Expand Down
Loading