fix(patch): match canonically equivalent unicode#32795
Draft
cyq1017 wants to merge 1 commit into
Draft
Conversation
Signed-off-by: cyq <15000851237@163.com>
Contributor
|
The following comment was made by an LLM, it may be inaccurate: Potential Duplicate Found:
Why it's related: Both PRs address the same issue (#31651) of matching canonically equivalent Unicode text in patch application. PR #31847 appears to be an earlier attempt at fixing this problem with NFC/NFD normalization. You may want to check if #31847 is already merged or closed, and consolidate work if needed. |
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
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
1 participant
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?
apply_patchcould fail to match a file line when the file stores the text in NFD form and the patch old line uses NFC form. The text is canonically equivalent, but the existing match passes only handled exact text, whitespace differences, and punctuation normalization.This adds a final
seekSequencepass that compares trimmed lines after NFC normalization. Existing match priority stays the same; the new pass only handles Unicode canonical equivalence after the stricter passes fail.How did you verify your code works?
bun test test/tool/apply_patch.test.ts -t "matches with canonically equivalent Unicode text"bun test test/tool/apply_patch.test.tsbun test test/patch/patch.test.tsprettier --check packages/opencode/src/patch/index.ts packages/opencode/test/tool/apply_patch.test.tsgit diff --check HEAD~1..HEADScreenshots / recordings
Not applicable.
Checklist