[SourceKit/CodeFormat] Column-align multiple patterns in catch clauses #30870
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
|
@swift-ci please test |
owenv
reviewed
Apr 8, 2020
test/swift-indent/basic.swift
Outdated
| { | ||
| print("hello") | ||
| } | ||
| catch MyErr.a(let code. let message), |
There was a problem hiding this comment.
Suggested change
| catch MyErr.a(let code. let message), | |
| catch MyErr.a(let code, let message), |
lib/IDE/Formatting.cpp
Outdated
Comment on lines
2096
to
2098
| if (!Elem.getPattern() || Elem.getPattern()->isImplicit()) | ||
| continue; |
There was a problem hiding this comment.
Will this indent something like the following correctly?
do {
throw MyErr.a
} catch where foo == 0,
where bar == 1 {
}
I don't think anyone will be writing code like this in practice, but it is allowed and may be worth testing
There was a problem hiding this comment.
Good catch! I'll fix it and add it to the test cases.
Catch clauses now support mutliple patterns. Like 'case' patterns, these
should be column-aligned if split across multiple lines.
do {
...
} catch MyErr.a(let x),
MyErr.b(let x) {
print("hello")
}
nathawes
force-pushed
the
mutiple-catch-pattern-indentation
branch
from
592d629 to
19d6eff
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
owenv
approved these changes
Apr 8, 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.
catchclauses now support multiple patterns thanks to #27776. Likecasepatterns, these should be column-aligned if split across multiple lines like below:Resolves rdar://problem/61614223