fix: preserve blank line after ONBUILD <directive>#53
Merged
Conversation
Inner directives nested under ONBUILD are parsed with StartLine=0, so their OriginalMultiline is empty and formatters like formatBasic/formatEnv fall back to n.Original, which has no trailing newline. FormatOnBuild then returned "ONBUILD ARG FOO=bar" without a newline, causing the next directive (and any blank line separating it) to collapse onto the same position. Fixes #52. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.
Summary
Fixes #52.
Inner directives nested under
ONBUILDare parsed by buildkit withStartLine=0/EndLine=0, so theirOriginalMultilineis empty. Formatters likeformatBasic(ARG, LABEL, USER, …) andformatEnvfall back ton.Original, which has no trailing newline. As a result,FormatOnBuildreturned e.g."ONBUILD ARG FOO=bar"with no trailing\n, and the subsequent blank line + directive collapsed onto the following line.The fix appends a trailing newline in
FormatOnBuildwhen the formatted inner directive lacks one, which is the invariant every other directive formatter already provides.Test plan
tests/in/onbuild-blank-lines.dockerfile/tests/out/onbuild-blank-lines.dockerfilecovering ONBUILD ARG / ENV / LABEL with blank lines around themgo test ./...passes🤖 Generated with Claude Code