[Diagnostics] Add a fix-it for try instead of throws in function decl… #27647
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 smoke test |
|
My bad! .. PR was not compiling. I pushed 59e8f20 with the fix. @CodaFi, could you pls trigger tests again? Thanks! |
|
@swift-ci please smoke test |
…s and types.
Sometimes one would misstype `throws` for `try` so we provide a fix-it for that.
It might happen in two cases:
In function declarations:
```swift
func foo() try {}
```
In function types:
```swift
let f = () try -> Int
```
Resolves SR-11574.
Had to rebase due to revert of syxtax parsing swiftlang#27675.
|
@rintaro no worries. updated. |
rintaro
reviewed
Oct 16, 2019
lib/Parse/ParsePattern.cpp
Outdated
| } else if (Tok.is(tok::kw_try)) { | ||
| SourceLoc tryLoc = consumeToken(); | ||
| diagnose(tryLoc, diag::throw_in_function_type) | ||
| .fixItReplace(tryLoc, "throws"); |
There was a problem hiding this comment.
I think we should pretend that the throws is correctly written. i.e. We should set throwsLoc. Does just modifying the condition of the previous block to if (Tok.isAny(tok::kw_throw, kw_try)) work?
There was a problem hiding this comment.
yes, setting throwsLoc does work. I pushed 9656057
|
@swift-ci Please smoke test |
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.
…s and types.
Sometimes one would misstype
throwsfortryso we provide a fix-it for that.It might happen in two cases:
In function declarations:
In function types:
Resolves SR-11574.