feat: Add dereferencing autocomplete #18917
Conversation
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
rustbot
removed
has-merge-commits
S-waiting-on-author
crates/ide-completion/src/item.rs
Outdated
| let (label, edit_text) = match mode { | ||
| CompletionItemRefMode::Reference(Mutability::Shared) => { | ||
| (format!("&{}", self.label.primary), "&") | ||
| } | ||
| CompletionItemRefMode::Reference(Mutability::Mut) => { | ||
| (format!("&mut {}", self.label.primary), "&mut ") | ||
| } | ||
| CompletionItemRefMode::Dereference => (format!("*{}", self.label.primary), "*"), | ||
| }; | ||
|
|
||
| (label, ide_db::text_edit::Indel::insert(offset, String::from(edit_text)), relevance) |
There was a problem hiding this comment.
| let (label, edit_text) = match mode { | |
| CompletionItemRefMode::Reference(Mutability::Shared) => { | |
| (format!("&{}", self.label.primary), "&") | |
| } | |
| CompletionItemRefMode::Reference(Mutability::Mut) => { | |
| (format!("&mut {}", self.label.primary), "&mut ") | |
| } | |
| CompletionItemRefMode::Dereference => (format!("*{}", self.label.primary), "*"), | |
| }; | |
| (label, ide_db::text_edit::Indel::insert(offset, String::from(edit_text)), relevance) | |
| let prefix= match mode { | |
| CompletionItemRefMode::Reference(Mutability::Shared) => "&", | |
| CompletionItemRefMode::Reference(Mutability::Mut) => "&mut ", | |
| CompletionItemRefMode::Dereference =>"*", | |
| }; | |
| let label = format!("{prefix}{}", self.label.primary), | |
| (label, ide_db::text_edit::Indel::insert(offset, String::from(prefix)), relevance) |
crates/ide-completion/src/render.rs
Outdated
| } | ||
| } | ||
|
|
||
| if let Some(completion_ty_without_ref) = completion_ty.remove_ref() { |
There was a problem hiding this comment.
We can move this to the start of the function as let expected_type_without_ref = expected_type.remove_ref()?; since the branch above makes use of it as well either way to deduplicate a bit
There was a problem hiding this comment.
Just to clarify - are you suggesting we move both remove_ref() calls to the start of the function, or just the expected_type.remove_ref() call? Its also possible that the expected_type.remove_ref() returns None and would early return so there is still a need for the following code in the first branch.
if let Some(expected_without_ref) = &expected_type_without_ref
There was a problem hiding this comment.
@Veykril I pushed the update to move both of these methods to the top of the function. Let me know if this is not what you were looking for.
crates/rust-analyzer/src/lib.rs
Outdated
| match ref_mode { | ||
| CompletionItemRefMode::Reference(mutability) => match mutability { | ||
| Mutability::Shared => hasher.update("&"), | ||
| Mutability::Mut => hasher.update("&mut"), | ||
| }, | ||
| CompletionItemRefMode::Dereference => { | ||
| hasher.update("*"); | ||
| } | ||
| } |
There was a problem hiding this comment.
Similar to above, we can move just return the strings in the match, then call hasher.update on that
3 participants
This PR adds dereferencing suggestions for Copy types. When a function expects a non-reference type T and we have a &T where T: Copy, we now suggest the dereferenced value in completions.
#18873