Enable Assist edit for tuple<->named struct for the struct and visiblity keywords #19901
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
rustbot
added
the
S-waiting-on-review
Veykril
reviewed
Jun 2, 2025
crates/ide-assists/src/utils.rs
Outdated
Comment on lines
1156
to
1165
| ctx.find_node_at_offset::<ast::Name>() | ||
| .and_then(|name| name.syntax().parent()) | ||
| .or(ctx | ||
| .token_at_offset() | ||
| .find(|leaf| matches!(leaf.kind(), STRUCT_KW)) | ||
| .and_then(|kw| kw.parent())) | ||
| .or(ctx | ||
| .find_node_at_offset::<ast::Visibility>() | ||
| .and_then(|visibility| visibility.syntax().parent())) | ||
| .and_then(<Either<ast::Struct, ast::Variant>>::cast) |
There was a problem hiding this comment.
A simpler approach would be to do ctx.find_node_at_offset::<ast::Struct>(), then fetch the .field_list() and check if the cursor position is to the left of the field list, that is ctx.offset() < field_list.syntax().text_range().start()
Same for ast::Variant. Then we can also get rid of the helper method and just do this in the corresponding assists directly.
There was a problem hiding this comment.
I thought about that too, but wasn't sure if we wanted to use the offsets for this. But it is much easier to read, so I'll change to that approach.
There was a problem hiding this comment.
I've removed the utility method and did it via the offset
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.
I was looking for an issue to do my first contribution to this repo. In the discussion for the issue #19666 , a suggestion was made to expand when the code action for converting between named/tuple structs is triggered to include the struct and visibility keywords, so I've added these too.
Maybe the approach of targetting specific keywords is not that nice and it should be any kind of node who parent is a struct but not the inner part of a struct?
PS. I'm new to rust and this repo, so please feel free to nitpick the code