squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #11517

Browse source 
11517: fix: Fix qualfiied record literal completion triggering too eagerly r=Veykril a=Veykril

Supercedes https://github.com/rust-analyzer/rust-analyzer/pull/10909
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/10889
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2022-02-21 12:52:11 +00:00 committed by GitHub
parent 36f302355b 50458e350f
commit 8c718a47c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/ide_completion/src/completions/record.rs
View file

@ -63,11 +63,12 @@ pub(crate) fn complete_record_literal(
}
if let hir::Adt::Struct(strukt) = ctx.expected_type.as_ref()?.as_adt()? {
let module = if let Some(module) = ctx.module { module } else { strukt.module(ctx.db) };
if ctx.path_qual().is_none() {
let module = if let Some(module) = ctx.module { module } else { strukt.module(ctx.db) };
let path = module.find_use_path(ctx.db, hir::ModuleDef::from(strukt));
let path = module.find_use_path(ctx.db, hir::ModuleDef::from(strukt));
acc.add_struct_literal(ctx, strukt, path, None);
acc.add_struct_literal(ctx, strukt, path, None);
}
}
Some(())