Improve folding ranges if editor only supports line folding #1385
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
If the folding range doesn't end at the end of the last line, exclude that line from the folding range since the end line gets folded away. This means if we reported `end.line`, we would eg. fold away the `}` that matches a `{`, which looks surprising.
If the folding range does end at the end of the line we are in cases that don't have a closing indicator (like comments), so we can fold the last line as well.
|
@swift-ci Please test |
bnbarham
approved these changes
Jun 1, 2024
hamishknight
reviewed
Jun 3, 2024
| } | ||
| let line = self[position.line] | ||
| let suffixAfterPositionColumn = line[line.utf16.index(line.startIndex, offsetBy: position.utf16index)...] | ||
| return suffixAfterPositionColumn.allSatisfy(\.isNewline) |
There was a problem hiding this comment.
Should we care about trailing whitespace too?
There was a problem hiding this comment.
I don’t think it matters in practice because this is really only for comment folding, which would include the whitespace in the comment’s trivia and thus point to the position right before the newline.
Let’s leave it for now because I don’t have a clean name for this function if we also consider whitespaces.
This was referenced Jun 4, 2024
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.
If the folding range doesn't end at the end of the last line, exclude that line from the folding range since the end line gets folded away. This means if we reported
end.line, we would eg. fold away the}that matches a{, which looks surprising.If the folding range does end at the end of the line we are in cases that don't have a closing indicator (like comments), so we can fold the last line as well.