Fix extra whitespace in text rendering of indented empty lines #2101
Conversation
This file contains 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
paulcadman
force-pushed
the
fix-pretty-whitespace
branch
from
be9651f
to
a465cdc
Compare
paulcadman
force-pushed
the
fix-pretty-whitespace
branch
from
a465cdc
to
7c2701e
Compare
janmasrovira
approved these changes
May 19, 2023
The prettyprinter library takes care avoid adding whitespace to empty lines when it is rendering indented text. See: https://github.com/quchen/prettyprinter/blob/7e32c010ecfaa510c0cbf6ffea04bc7db95d4fcb/prettyprinter/src/Prettyprinter/Internal.hs#L1999 However it only does this for unannotated text. In our code we were stripping annotations from renderings using `toTextStream` but we must remove the annotations before calling `layoutPretty`. That's what this commit does.
jonaprieto
force-pushed
the
fix-pretty-whitespace
branch
from
7c2701e
to
e5e70f1
Compare
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.
The prettyprinter library takes care to avoid adding whitespace to empty lines when it is rendering indented text.
See:
https://github.com/quchen/prettyprinter/blob/7e32c010ecfaa510c0cbf6ffea04bc7db95d4fcb/prettyprinter/src/Prettyprinter/Internal.hs#L1999
However it only does this for unannotated text.
In our code we were stripping annotations from renderings within
toTextStreambut we must remove the annotations before callinglayoutPrettyto get the proper handling of whitespace with indentations. That's what this PR does.