yamlpatch: apply newline to EOF consistently - #1372
Merged
Merged
Conversation
Signed-off-by: William Woodruff <william@yossarian.net>
woodruffw
commented
Nov 27, 2025
Comment on lines
+471
to
473
| if !patched_content.ends_with('\n') { | ||
| patched_content.push('\n'); | ||
| } |
Member
Author
There was a problem hiding this comment.
This is the main change: instead of trying to preserve a newline in a replacement span, we now unconditionally insert one at EOF if not already present.
This ends up being an overproduction if a patch doesn't span the EOF, but it's a strictly correct one.
woodruffw
changed the title
woodruffw
commented
Nov 27, 2025
Comment on lines
-222
to
-227
| // Only include trailing newline if it's the last character in the document. | ||
| // This preserves document-level trailing newlines without interfering with | ||
| // newlines that are part of the document structure. | ||
| if end + 1 == content.len() && content.as_bytes()[end] == b'\n' { | ||
| end += 1; | ||
| } |
Member
Author
There was a problem hiding this comment.
I didn't try to prove it out, but I think the reason this didn't work is because some incoming patches didn't have a trailing newline, and so if tree-sitter-yaml didn't include one in the captured node for whatever reason we'd end up trimming it.
Signed-off-by: William Woodruff <william@yossarian.net>
Signed-off-by: William Woodruff <william@yossarian.net>
Signed-off-by: William Woodruff <william@yossarian.net>
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.
Follows #1323. Fixes #1370.