[Diagnostics] Add a fix-it for misplaced throws in function types #25306
Conversation
This file contains 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
|
@brentdax: This fixes the bug that you reported. Thanks |
jrose-apple
reviewed
Jun 7, 2019
lib/Parse/ParseType.cpp
Outdated
| @@ -417,6 +417,12 @@ ParserResult<TypeRepr> Parser::parseType(Diag<> MessageID, | |||
| if (Tok.is(tok::arrow)) { | |||
| // Handle type-function if we have an arrow. | |||
| SourceLoc arrowLoc = consumeToken(); | |||
| if(Tok.is(tok::kw_throws)) { | |||
There was a problem hiding this comment.
Nitpick: Please put a space before the open-paren.
lib/Parse/ParseType.cpp
Outdated
| if(Tok.is(tok::kw_throws)) { | ||
| Diag<> DiagID = diag::throws_in_wrong_position; | ||
| diagnose(Tok.getLoc(), DiagID).fixItInsert(arrowLoc, "throws ") | ||
| .fixItRemove(Tok.getLoc()); |
There was a problem hiding this comment.
Looks like a tab snuck in here.
lib/Parse/ParseType.cpp
Outdated
| Diag<> DiagID = diag::throws_in_wrong_position; | ||
| diagnose(Tok.getLoc(), DiagID).fixItInsert(arrowLoc, "throws ") | ||
| .fixItRemove(Tok.getLoc()); | ||
| consumeToken(); |
There was a problem hiding this comment.
This is good, but I think we can probably recover as if the user wrote throws in the correct place by setting throwsLoc.
|
@swift-ci please smoke test |
|
@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.
Adds a diagnostic error for misplaced throws in function types. For e.g:
Resolves SR-10703.