dedent: respect zero-indent lines when computing the shared indent#83
Open
c-tonneslan wants to merge 1 commit into
Open
dedent: respect zero-indent lines when computing the shared indent#83c-tonneslan wants to merge 1 commit into
c-tonneslan wants to merge 1 commit into
Conversation
minIndent only updated its running minimum when curIndent > 0 and used 0 as the "unset" sentinel. A line that started flush left (curIndent == 0 at the first non-whitespace byte) was silently ignored, so the function reported a positive shared indent and dedent went on to strip leading whitespace off lines that should have been left alone. Switch the sentinel to -1 and update the minimum on any line whose first non-whitespace byte we reach with shouldAppend still true. A flush-left content line now correctly pulls the shared indent down to zero, and String() short-circuits as before. Closes muesli#72. Signed-off-by: Charlie Tonneslan <cst0520@gmail.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.
Closes #72.
`minIndent` only updated its running minimum when `curIndent > 0` and used 0 as the "unset" sentinel. A line that started flush left (`curIndent == 0` at the first non-whitespace byte) was silently ignored, so the function reported a positive shared indent and `dedent` stripped leading whitespace off lines that should have been left alone.
Switch the sentinel to `-1` and update the minimum on any line whose first non-whitespace byte we reach with `shouldAppend` still true. A flush-left content line now correctly pulls the shared indent down to zero, and `String()` short-circuits the same way as before.
Added the issue's reproducer to `TestDedent`.