language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Code review fixes

Browse source
This commit is contained in:
Kirill Bulatov 2021-01-04 18:33:05 +02:00
parent ed1ef3ae13
commit ca42a52051
3 changed files with 48 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/completion/src/completions/unqualified_path.rs
View file

@ -3,7 +3,7 @@
use std::iter;
use either::Either;
use hir::{Adt, AsAssocItem, ModPath, ModuleDef, ScopeDef, Type};
use hir::{Adt, ModPath, ModuleDef, ScopeDef, Type};
use ide_db::helpers::insert_use::ImportScope;
use ide_db::imports_locator;
use syntax::AstNode;
@ -142,15 +142,8 @@ fn fuzzy_completion(acc: &mut Completions, ctx: &CompletionContext) -> Option<()
Some(40),
potential_import_name,
true,
true,
)
.filter(|import_candidate| match import_candidate {
Either::Left(ModuleDef::Function(function)) => function.as_assoc_item(ctx.db).is_none(),
Either::Left(ModuleDef::Const(const_)) => const_.as_assoc_item(ctx.db).is_none(),
Either::Left(ModuleDef::TypeAlias(type_alias)) => {
type_alias.as_assoc_item(ctx.db).is_none()
}
_ => true,
})
.filter_map(|import_candidate| {
Some(match import_candidate {
Either::Left(module_def) => {