language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: auto-complete import for aliased function and module

Browse source
This commit is contained in:
Khanh Duong Quoc 2024-10-23 22:11:08 +09:00
parent f9935be013
commit c4b097719d
No known key found for this signature in database
GPG key ID: 68399C39885161F3
2 changed files with 50 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ide-completion/src/render.rs
View file

@ -281,8 +281,14 @@ pub(crate) fn render_resolution_with_import(
import_edit: LocatedImport,
) -> Option<Builder> {
let resolution = ScopeDef::from(import_edit.original_item);
let local_name = scope_def_to_name(resolution, &ctx, &import_edit)?;
//this now just renders the alias text, but we need to find the aliases earlier and call this with the alias instead
// Use the last segment when `item_to_import` matches `original_item`,
// as it will take the aliased name into account.
let local_name = if import_edit.item_to_import == import_edit.original_item {
import_edit.import_path.segments().last()?.clone()
} else {
scope_def_to_name(resolution, &ctx, &import_edit)?
};
// This now just renders the alias text, but we need to find the aliases earlier and call this with the alias instead.
let doc_aliases = ctx.completion.doc_aliases_in_scope(resolution);
let ctx = ctx.doc_aliases(doc_aliases);
Some(render_resolution_path(ctx, path_ctx, local_name, Some(import_edit), resolution))