Fix right justification: conditionally preserve trailing space character #3649
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
willmcgugan
requested changes
Mar 28, 2025
| @@ -137,7 +135,7 @@ def justify( | |||
| line.pad_right(width - cell_len(line.plain)) | |||
| elif justify == "right": | |||
| for line in self._lines: | |||
| line.rstrip() | |||
| line[:-1].rstrip() if line[-1] == Text(" ") else line.rstrip() | |||
There was a problem hiding this comment.
Since the markup is irrelevent for the condition, it is faster to do line.plain.endswith(" ")
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.
Type of changes
Checklist
Description
Please describe your changes here. If this fixes a bug, please link to the issue, if possible.
#3641 details an issue with right justified titles of panels losing the trailing whitespace, and it being reassigned to the beginning of the segment. It appears that trailing whitespace is removed via rstrip, but titles have a singular space added after the text (I assume for visual clarity), which is inadvertently removed.
Seeing as this change might have knock-on effects, I attempted to mitigate that by using a ternary if, checking that the final character is a space and if so, leaving that space out of the rstrip. I have not added a test, since I do not know if the test mentioned in the issue is appropriate (seems very hardcoded), but could think up a regression test if necessary (don't know exactly how atm, but I could learn).
First time contributing to open source, hope this isn't a dumb way to tackle the issue, but I do see how it could have some unintended consequences.