Fix CRLF line endings causing extra blank lines between comments#782
Open
cv-dote wants to merge 1 commit intoaws-cloudformation:mainfrom
Open
Fix CRLF line endings causing extra blank lines between comments#782cv-dote wants to merge 1 commit intoaws-cloudformation:mainfrom
cv-dote wants to merge 1 commit intoaws-cloudformation:mainfrom
Conversation
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 #, if available: #479
Description of changes:
When a YAML template with Windows-style CRLF (
\r\n) line endings is formatted withrain fmt, extra blank lines are inserted between consecutive comment lines. This is becauseyaml.v3preserves\rcharacters in node comment fields, and the formatting logic informat.gotreats\r-only lines as non-empty content.The fix strips
\rcharacters from the input at the beginning ofparse.String(), before passing it toyaml.Unmarshal. This normalizes line endings at the pipeline entry point, ensuring CRLF and LF inputs produce identical formatted output.Design doc: https://gist.github.com/cv-dote/713ad53ab1b29672ae8c3910e496d40d