Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-completion/src/context/analysis.rs')
-rw-r--r--crates/ide-completion/src/context/analysis.rs18
1 files changed, 8 insertions, 10 deletions
diff --git a/crates/ide-completion/src/context/analysis.rs b/crates/ide-completion/src/context/analysis.rs
index 2a293313f2..58c0f683a3 100644
--- a/crates/ide-completion/src/context/analysis.rs
+++ b/crates/ide-completion/src/context/analysis.rs
@@ -1183,18 +1183,16 @@ fn classify_name_ref<'db>(
let arg_name = arg_name.text();
for item in trait_.items_with_supertraits(sema.db) {
match item {
- hir::AssocItem::TypeAlias(assoc_ty) => {
- if assoc_ty.name(sema.db).as_str() == arg_name {
+ hir::AssocItem::TypeAlias(assoc_ty)
+ if assoc_ty.name(sema.db).as_str() == arg_name => {
override_location = Some(TypeLocation::AssocTypeEq);
return None;
- }
- },
- hir::AssocItem::Const(const_) => {
- if const_.name(sema.db)?.as_str() == arg_name {
+ },
+ hir::AssocItem::Const(const_)
+ if const_.name(sema.db)?.as_str() == arg_name => {
override_location = Some(TypeLocation::AssocConstEq);
return None;
- }
- },
+ },
_ => (),
}
}
@@ -1592,7 +1590,7 @@ fn classify_name_ref<'db>(
kind_macro_call(it)?
},
ast::Meta(meta) => make_path_kind_attr(meta)?,
- ast::Visibility(it) => PathKind::Vis { has_in_token: it.in_token().is_some() },
+ ast::VisibilityInner(it) => PathKind::Vis { has_in_token: it.in_token().is_some() },
ast::UseTree(_) => PathKind::Use,
// completing inside a qualifier
ast::Path(parent) => {
@@ -1621,7 +1619,7 @@ fn classify_name_ref<'db>(
kind_macro_call(it)?
},
ast::Meta(meta) => make_path_kind_attr(meta)?,
- ast::Visibility(it) => PathKind::Vis { has_in_token: it.in_token().is_some() },
+ ast::VisibilityInner(it) => PathKind::Vis { has_in_token: it.in_token().is_some() },
ast::UseTree(_) => PathKind::Use,
ast::RecordExpr(it) => make_path_kind_expr(it.into()),
_ => return None,