rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change resolve_path to return the fully resolved path or PerNs::none

Browse Source 
This also adds new pub(crate) resolve_path_segments which returns the
PathResult, which may or may not be fully resolved. PathResult is also now
pub(crate) since it is an implementation detail.
This commit is contained in:
Ville Penttinen
2019-02-22 10:15:23 +02:00
parent 39679d499f
commit 247d1c17b3
5 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_ide_api/src/completion/complete_path.rs
View File

@@ -10,7 +10,7 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
Some(path) => path.clone(),
_ => return,
};
let def = match ctx.resolver.resolve_path(ctx.db, &path).into_per_ns().take_types() {
let def = match ctx.resolver.resolve_path(ctx.db, &path).take_types() {
Some(Resolution::Def(def)) => def,
_ => return,
};

2
crates/ra_ide_api/src/goto_definition.rs
View File

@@ -79,7 +79,7 @@ pub(crate) fn reference_definition(
if let Some(path) =
name_ref.syntax().ancestors().find_map(ast::Path::cast).and_then(hir::Path::from_ast)
{
let resolved = resolver.resolve_path(db, &path).into_per_ns();
let resolved = resolver.resolve_path(db, &path);
match resolved.clone().take_types().or_else(|| resolved.take_values()) {
Some(Resolution::Def(def)) => return Exact(NavigationTarget::from_def(db, def)),
Some(Resolution::LocalBinding(pat)) => {