Add assignment type analysis for ide-completion #20381
Merged
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
| @@ -1870,3 +1882,23 @@ fn next_non_trivia_sibling(ele: SyntaxElement) -> Option<SyntaxElement> { | |||
| } | |||
| None | |||
| } | |||
|
|
|||
| fn prev_assign_token_at_whitespace(mut token: SyntaxToken) -> SyntaxToken { | |||
| while token.kind() == SyntaxKind::WHITESPACE | |||
There was a problem hiding this comment.
Suggested change
| while token.kind() == SyntaxKind::WHITESPACE | |
| while token.kind().is_trivia() |
This includes comments.
Generally it'd be better to use the parsed tree, but given completion works with malformed trees (and speculative execution is not yet a thing) I don't think it's viable.
There was a problem hiding this comment.
This includes comments.
ok
| @@ -562,6 +562,7 @@ fn expected_type_and_name<'db>( | |||
| token: &SyntaxToken, | |||
| name_like: &ast::NameLike, | |||
| ) -> (Option<Type<'db>>, Option<NameOrNameRef>) { | |||
| let token = prev_assign_token_at_whitespace(token.clone()); | |||
There was a problem hiding this comment.
Why do we need this? That is, why doesn't just adding ast::BinExpr to the match below works?
There was a problem hiding this comment.
For { x = $0 }, token is }
|
Thanks! |
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 #20361