Repository navigation
fix(tools): retain conflict markers around invalid UTF-8 - #2129
Open
j0s3lu1555 wants to merge 2 commits into
Open
j0s3lu1555 wants to merge 2 commits into
j0s3lu1555 wants to merge 2 commits into
Conversation
j0s3lu1555
marked this pull request as ready for review
October 28, 2026 14:30
github-actions
Bot
added
bot:land-candidate
This was referenced Oct 31, 2026
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.
Conflict-marker scans currently return an empty result if any byte in a scanned file fails UTF-8 decoding. A file containing ordinary ASCII conflict markers plus an unrelated malformed byte therefore looks clean.
Decode with replacement in both readers so the structural marker lines remain available to the existing scanner. Add regressions for malformed bytes before and after a marker block, a workflow structural check preceded by a malformed byte, and controls for marker-free text and out-of-scope binary files. The scanner remains a heuristic; this does not make a claim about compiler acceptance or security.
Closes #2124.
Validation: 30 focused conflict-marker tests pass; the test-registration guard and the conflict-marker guard pass. The expanded focused suite reproduced three failures before the fix. Base revision:
1f0ff978f4deff78c77bca96db0e3e46f32de71b. The full compiler/runtime pipeline also passed on the fork’s standard Ubuntu runners: CI run 40703957271, commitddf076593772adb24e7a91b2ebefb2b6b9bf289a(bothquickandcompilersuccessful). That includes the workspace tests, checker corpus, differential loop, runtime hygiene and end-to-end examples. These broader checks ran in the fork, not on the memory-constrained Mac. Upstream CI approval, review and merge remain the maintainer’s decision.AI-assisted contribution by Jose’s Codex assistant, submitted through the existing authorized account.