fix(opencode): match canonically equivalent Unicode in patches - #40198
Open
leizd wants to merge 1 commit into
Open
fix(opencode): match canonically equivalent Unicode in patches#40198leizd wants to merge 1 commit into
leizd wants to merge 1 commit into
Conversation
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.
Issue for this PR
Closes #31651
Type of change
What does this PR do?
Adds a final canonical Unicode-equivalence matching pass to
seekSequence().Patch verification previously failed when the file and patch contained
visually identical text represented using different Unicode normalization
forms, such as NFC and NFD.
The existing matching passes and their order are preserved. If they all
fail, the new pass compares both lines after NFC normalization and trimming:
This deliberately uses NFC rather than NFKC, so it only handles canonical
equivalence and does not introduce compatibility or fuzzy matching.
The file contents and replacement text are not globally normalized, so the
replacement retains its original normalization form.
How did you verify your code works?
Added regression coverage for:
éwith NFC file content and an NFD patchCommands run:
Before the implementation change, the focused regression tests reproduced
Failed to find expected lines.Screenshots / recordings
Not applicable.
Checklist