fix: strip trailing CR in diff content to remove stray "CR" box#2536
Open
gadfly3173 wants to merge 1 commit into
Open
fix: strip trailing CR in diff content to remove stray "CR" box#2536gadfly3173 wants to merge 1 commit into
gadfly3173 wants to merge 1 commit into
Conversation
Git splits diff lines on '\n', so the '\r' from CRLF/CR files stays glued to the line content in TextDiffLine.Content. After the editor trims the trailing newline, the last line is left with an isolated '\r', which AvaloniaEdit renders as a boxed "CR" control character. Strip it at parse time. RawContent keeps the raw bytes unchanged, so patch generation and the \r\n/\n line-ending markers are unaffected.
Collaborator
|
What's the original |
Contributor
Author
git -C "$REPO" --no-pager show $C | grep '^[-+]' | cat -A |
Collaborator
|
I mean the original |
Contributor
Author
|
Do you mean this? 
|
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
2 participants
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 splits diff lines on
\n, so the\rfrom CRLF/CR files stays glued to the line content in TextDiffLine.Content. After the editor trims the trailing newline, the last line is left with an isolated\r, which AvaloniaEdit renders as a boxed "CR" control character.Strip it at parse time. RawContent keeps the raw bytes unchanged, so patch generation and the
\r\n/\nline-ending markers are unaffected.Introduced by commit 6a47cec
Original: