language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Lift segment check out of the loop in resolve_path_in_value_ns

Browse source
This commit is contained in:
Lukas Wirth 2023-03-05 15:42:40 +01:00
parent a51267c5e0
commit 27fad2ad75
1 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

102
crates/hir-def/src/resolver.rs
View file

@ -255,55 +255,67 @@ impl Resolver {
return self.module_scope.resolve_path_in_value_ns(db, path); return self.module_scope.resolve_path_in_value_ns(db, path);
} }
for scope in self.scopes() { if n_segments <= 1 {
match scope { for scope in self.scopes() {
Scope::ExprScope(_) if n_segments > 1 => continue, match scope {
Scope::ExprScope(scope) => { Scope::ExprScope(scope) => {
let entry = scope let entry = scope
.expr_scopes .expr_scopes
.entries(scope.scope_id) .entries(scope.scope_id)
.iter() .iter()
.find(|entry| entry.name() == first_name); .find(|entry| entry.name() == first_name);
if let Some(e) = entry { if let Some(e) = entry {
return Some(ResolveValueResult::ValueNs(ValueNs::LocalBinding(e.pat()))); return Some(ResolveValueResult::ValueNs(ValueNs::LocalBinding(
e.pat(),
)));
}
}
Scope::GenericParams { params, def } => {
if let Some(id) = params.find_const_by_name(first_name, *def) {
let val = ValueNs::GenericParam(id);
return Some(ResolveValueResult::ValueNs(val));
}
}
&Scope::ImplDefScope(impl_) => {
if first_name == &name![Self] {
return Some(ResolveValueResult::ValueNs(ValueNs::ImplSelf(impl_)));
}
}
// bare `Self` doesn't work in the value namespace in a struct/enum definition
Scope::AdtScope(_) => continue,
Scope::BlockScope(m) => {
if let Some(def) = m.resolve_path_in_value_ns(db, path) {
return Some(def);
}
} }
} }
Scope::GenericParams { params, def } if n_segments > 1 => { }
if let Some(id) = params.find_type_by_name(first_name, *def) { } else {
let ty = TypeNs::GenericParam(id); for scope in self.scopes() {
return Some(ResolveValueResult::Partial(ty, 1)); match scope {
Scope::ExprScope(_) => continue,
Scope::GenericParams { params, def } => {
if let Some(id) = params.find_type_by_name(first_name, *def) {
let ty = TypeNs::GenericParam(id);
return Some(ResolveValueResult::Partial(ty, 1));
}
} }
} &Scope::ImplDefScope(impl_) => {
Scope::GenericParams { .. } if n_segments != 1 => continue, if first_name == &name![Self] {
Scope::GenericParams { params, def } => { return Some(ResolveValueResult::Partial(TypeNs::SelfType(impl_), 1));
if let Some(id) = params.find_const_by_name(first_name, *def) { }
let val = ValueNs::GenericParam(id);
return Some(ResolveValueResult::ValueNs(val));
} }
} Scope::AdtScope(adt) => {
if first_name == &name![Self] {
&Scope::ImplDefScope(impl_) => { let ty = TypeNs::AdtSelfType(*adt);
if first_name == &name![Self] { return Some(ResolveValueResult::Partial(ty, 1));
return Some(if n_segments > 1 { }
ResolveValueResult::Partial(TypeNs::SelfType(impl_), 1)
} else {
ResolveValueResult::ValueNs(ValueNs::ImplSelf(impl_))
});
} }
} Scope::BlockScope(m) => {
// bare `Self` doesn't work in the value namespace in a struct/enum definition if let Some(def) = m.resolve_path_in_value_ns(db, path) {
Scope::AdtScope(_) if n_segments == 1 => continue, return Some(def);
Scope::AdtScope(adt) => { }
if first_name == &name![Self] {
let ty = TypeNs::AdtSelfType(*adt);
return Some(ResolveValueResult::Partial(ty, 1));
}
}
Scope::BlockScope(m) => {
if let Some(def) = m.resolve_path_in_value_ns(db, path) {
return Some(def);
} }
} }
} }
@ -316,8 +328,8 @@ impl Resolver {
// If a path of the shape `u16::from_le_bytes` failed to resolve at all, then we fall back // If a path of the shape `u16::from_le_bytes` failed to resolve at all, then we fall back
// to resolving to the primitive type, to allow this to still work in the presence of // to resolving to the primitive type, to allow this to still work in the presence of
// `use core::u16;`. // `use core::u16;`.
if path.kind == PathKind::Plain && path.segments().len() > 1 { if path.kind == PathKind::Plain && n_segments > 1 {
if let Some(builtin) = BuiltinType::by_name(&path.segments()[0]) { if let Some(builtin) = BuiltinType::by_name(first_name) {
return Some(ResolveValueResult::Partial(TypeNs::BuiltinType(builtin), 1)); return Some(ResolveValueResult::Partial(TypeNs::BuiltinType(builtin), 1));
} }
} }