Repository navigation
fix(opencode): match canonically equivalent Unicode in patches - #31847
Closed
hereswilson wants to merge 1 commit into
Closed
hereswilson wants to merge 1 commit into
hereswilson wants to merge 1 commit into
Conversation
hereswilson
changed the title
hereswilson
force-pushed
the
unicode-patch-match
branch
from
June 11, 2026 07:08
faed68b to
3541f7a
Compare
This was referenced Jun 11, 2026
3 tasks done
Contributor
|
Automated PR Cleanup Thank you for contributing to opencode. Due to the high volume of PRs from users and AI agents, we periodically close older PRs using automated criteria so maintainers can focus review time on the most active and community-supported contributions. This PR was closed because it matched the following cleanup criteria:
PRs created within the last month are not affected by this cleanup. If you believe this PR was closed incorrectly, or if you are still actively working on it, please leave a comment explaining why it should be reopened. A maintainer can review and reopen it if appropriate. Thanks again for taking the time to contribute. |
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?
apply_patchcould fail to update files when the patch text and file contents were visually identical but encoded with different canonical Unicode forms, such as NFC patch text matching NFD file text.This keeps patch matching ordered from strict to loose: exact matches still win first, then existing whitespace and punctuation fallbacks run, and only then does the matcher try NFC comparison after punctuation normalization. The final fallback combines the existing punctuation normalization with canonical NFC comparison. It does not use compatibility normalization such as NFKC, so compatibility equivalent lookalikes remain rejected.
The fallback matcher now precomputes transformed patch pattern lines so miss and normalization fallback paths do less repeated work.
How did you verify your code works?
bun test test/patch/patch.test.ts --timeout 30000bun typecheckbunx prettier --check src/patch/index.ts test/patch/patch.test.tsAdded regression coverage for NFC/NFD matching, punctuation plus NFC fallback, multi-line chunks, EOF fallback priority, exact match priority, compatibility equivalence rejection, and whitespace fallback preservation.
Screenshots / recordings
N/A — no UI change.
Checklist