Repository navigation
Check the preceding rune before recognizing conflict markers - #65464
Open
Jake Bailey (jakebailey) wants to merge 1 commit into
Open
Jake Bailey (jakebailey) wants to merge 1 commit into
Jake Bailey (jakebailey) wants to merge 1 commit into
Conversation
Looking two bytes behind a marker can mistake inline text for a line boundary and miss Unicode line separators. Decode the rune ending at the marker instead, retaining the ASCII fast path. Cover all marker kinds after line breaks, inline text, multibyte runes, and invalid UTF-8 so recognition does not depend on byte width.
typescript-automation
Bot
added
Author: Team
For Uncommitted Bug
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The review reports no active issues with the conflict-marker detection change.
No open issues 🎉
What changed in this PR
This PR corrects conflict-marker detection in the TypeScript scanner by checking the rune immediately preceding a marker, while retaining the ASCII fast path.
Changes:
- Fixes line-boundary detection for Unicode separators and inline text.
- Adds regression tests covering line endings, intervening text, multibyte runes, and invalid UTF-8 across all four marker forms.
| File | Description |
|---|---|
tsc/internal/scanner/scanner.go |
Decodes the preceding rune at the correct boundary when needed. |
tsc/internal/scanner/scanner_test.go |
Adds table-driven tests for conflict-marker line-start detection. |
Review effort: Balanced
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Looking two bytes behind a marker can mistake inline text for a line boundary and miss Unicode line separators. Decode the rune ending at the marker instead, retaining the ASCII fast path.