Repository navigation
fix(filesystem): apply LF edit_file text to CRLF files - #4933
Open
jaeminbird wants to merge 1 commit into
Open
jaeminbird wants to merge 1 commit into
jaeminbird wants to merge 1 commit into
Conversation
Files checked out with CRLF (Git for Windows' default core.autocrlf) are read back to the model with CRLF, but models send LF-only oldText, so every multi-line edit failed with "old text not found". When oldText isn't found, retry with the file's CRLF line endings, applied to oldText and newText alike, so the edit applies and the file keeps CRLF. The change is in ApplyEdits, so the TUI's edit preview matches what is written.
aheritier
added
area/tools
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.
Git for Windows defaults to
core.autocrlf=true, so checked-out files are CRLF.read_filereturns them with\r\n, but models send LF-onlyoldText, so every multi-lineedit_filefails with "old text not found" and the agent rewrites the whole file or gives up.ApplyEditsnow retries a missed edit with the file's CRLF endings, applied tooldTextandnewTexttogether so the file stays CRLF. It only kicks in after an exact miss, when the file has CRLF andoldTexthas a newline and no CR; LF files and exact matches are unchanged, and the TUI preview uses the same path.TestFilesystemTool_EditFileCRLFfails on main and passes here (4 controls); golangci-lint is clean.