Skip to content

[SR-9576][SourceKit] Fix syntax type when rethrows is present #22017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2019

Conversation

marcelofabri
Copy link
Contributor

Before this patch, SourceKit would return source.lang.swift.syntaxtype.identifier for types in a function if rethrows is present - it should return typeidentifier.

Another issue is that it'd return source.lang.swift.syntaxtype.attribute.builtin for rethrows - I think it should be keyword.

Resolves SR-9576.

cc @nkcsgexi

Copy link
Contributor

@nkcsgexi nkcsgexi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense. Thank you for fixing this!

@nkcsgexi
Copy link
Contributor

@swift-ci please smoke test and merge

@marcelofabri
Copy link
Contributor Author

@nkcsgexi Thanks for reviewing this!

It looks like CI hasn't started, maybe you could try asking it again? 😅

@nkcsgexi
Copy link
Contributor

@swift-ci please smoke test and merge

@marcelofabri
Copy link
Contributor Author

Just pushed a commit that should fix the test failure. @nkcsgexi can you please trigger CI again?

@nkcsgexi
Copy link
Contributor

Sure @swift-ci please smoke test and merge

@nkcsgexi
Copy link
Contributor

@swift-ci please smoke test and merge

@marcelofabri
Copy link
Contributor Author

just pushed a new commit that should really fix the tests this time™

@marcelofabri
Copy link
Contributor Author

@nkcsgexi Can you please trigger CI again? 🙏

@nkcsgexi
Copy link
Contributor

@swift-ci please smoke test

@marcelofabri
Copy link
Contributor Author

This is finally green ✅

@nkcsgexi nkcsgexi merged commit c74cf89 into swiftlang:master Jan 24, 2019
@nkcsgexi
Copy link
Contributor

Great! Merged.

@marcelofabri
Copy link
Contributor Author

Thanks, @nkcsgexi! Do you think it's worth to cherry-pick this to 5.0 or is it too late in the process?

@marcelofabri marcelofabri deleted the rethrows branch January 24, 2019 16:49
@nkcsgexi
Copy link
Contributor

No worries. We tend to keep 5.0 branch stable at this point of time. How about we leave it on master and it'll be landed after the next re-branching.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants