[SourceKit/CodeFormat] Indentation fixes for multi-line string, UnresolvedSpecializeExpr, and trailing target handling. #31098
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
…on ranges < >
They were missed before, so < > that should trigger outdenting weren't. E.g.
let x = foo<
Int, String, Int
>()
.count // Indented becase we didn't process the < > brackets previously.
|
@swift-ci please smoke test |
…ces and fix a bug where multi-line string indentation was modified. E.g. if/guard condition patterns are column-aligned, but hitting enter after the ',' below wasn't column-aligning the next empty line: guard let x = Optional(42), // No indentation added here after enter Also the isTargetContext() check takes a start and end token location, but wasn't accounting for the end location pointing a multiline string, so we weren't walking into such nodes. This meant we didn't realise the target location was within a multiline string in some cases, and we ended up interfering with whitespace in its content.
nathawes
force-pushed
the
indentation-fixes
branch
from
de420aa to
e01c1a1
Compare
|
@swift-ci please test |
|
@swift-ci please stress test |
|
Build failed |
|
Build failed |
nathawes
changed the title
benlangmuir
approved these changes
Apr 20, 2020
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.
Fixes a bug were we were indenting within a multi-line string when we shouldn't have been. The checks for walking into an AST node or not were based on their end source loc, which is the start of their last token. If that token was a multi-line string and line being indented was within it, we we wouldn't walk into the node, and so never set the flag to indicate we were attempting to indent within a string.
We weren't handling UnresolvedSpecializeExpr when determining if an expression was 'outdenting' or not, so we ended up indenting the filter call below when we shouldn't have:
It's now handled correctly.
Fixes up ListAligner (and the code using it) to handle trailing indentation targets in many more cases. This makes the as-you-type indentation more consistent with select-and-reindent-after-you're-done indentation. Hitting enter after a comma in an incomplete list, or after an empty list that requires at least one element now give the correct indentation in many more cases (including guard/if/while conditions, and enum case elements). A few lists still don't handle trailing indentation targets properly, though, because the parser drops them from the AST when incomplete or empty.
Resolves rdar://problem/62061741