Skip to content

Fix "inside" broken with mixed quote types #3170

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

Draft
phillco wants to merge 2 commits into
base: main
Choose a base branch
from
+85 −2
Draft

Fix "inside" broken with mixed quote types #3170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b077c2e
Fix "inside" broken with mixed quote types (#3109)
phillco Feb 14, 2026
049bf93
Update tests
AndreasArvidsson Feb 15, 2026
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
75 changes: 75 additions & 0 deletions data/fixtures/scopes/plaintext/surroundingPair/surroundingPair7.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
aaa's `bbb 'ccc'`
`ddd`
---

[#1 Content] =
[#1 Removal] =
[#1 Domain] = 0:3-0:12
>---------<
0| aaa's `bbb 'ccc'`

[#1 Interior: Content] = 0:4-0:10
>------<
0| aaa's `bbb 'ccc'`
[#1 Interior: Removal] = 0:4-0:11
>-------<
0| aaa's `bbb 'ccc'`

[#1 Boundary L] = 0:3-0:4
>-<
0| aaa's `bbb 'ccc'`

[#1 Boundary R] = 0:11-0:12
>-<
0| aaa's `bbb 'ccc'`

[#1 Insertion delimiter] = " "


[#2 Content] =
[#2 Domain] = 0:6-0:17
>-----------<
0| aaa's `bbb 'ccc'`

[#2 Removal] = 0:5-0:17
>------------<
0| aaa's `bbb 'ccc'`

[#2 Leading delimiter] = 0:5-0:6
>-<
0| aaa's `bbb 'ccc'`

[#2 Interior] = 0:7-0:16
>---------<
0| aaa's `bbb 'ccc'`

[#2 Boundary L] = 0:6-0:7
>-<
0| aaa's `bbb 'ccc'`

[#2 Boundary R] = 0:16-0:17
>-<
0| aaa's `bbb 'ccc'`

[#2 Insertion delimiter] = " "


[#3 Content] =
[#3 Removal] =
[#3 Domain] = 1:0-1:5
>-----<
1| `ddd`

[#3 Interior] = 1:1-1:4
>---<
1| `ddd`

[#3 Boundary L] = 1:0-1:1
>-<
1| `ddd`

[#3 Boundary R] = 1:4-1:5
>-<
1| `ddd`

[#3 Insertion delimiter] = " "
12 changes: 10 additions & 2 deletions ...gets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getSurroundingPairOccurrences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ export function getSurroundingPairOccurrences(

const openingDelimiter = openingDelimitersStack[openingDelimiterIndex];

// Pop stack up to and including the opening delimiter
openingDelimitersStack.length = openingDelimiterIndex;
if (side === "unknown") {
// For ambiguous delimiters (eg quotes), remove only the matched
// entry so that unrelated delimiter types pushed between the
// matched pair are preserved. See #3109.
openingDelimitersStack.splice(openingDelimiterIndex, 1);
} else {
// For non-ambiguous delimiters (eg parentheses), truncate the
// stack to enforce proper nesting.
openingDelimitersStack.length = openingDelimiterIndex;
}

result.push({
delimiterName: delimiterName,
Expand Down
Loading