language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

move resolve_local_scope

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-27 23:40:23 +03:00
parent 93fae08261
commit 67de38ec7d
6 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_analysis/src/imp.rs
View file

@ -20,8 +20,7 @@ use crate::{
completion::{completions, CompletionItem},
db::{self, FileSyntaxQuery, SyntaxDatabase},
hir::{
FunctionDescriptor, ModuleDescriptor,
function::FnDescriptor,
FnDescriptor, FunctionDescriptor, ModuleDescriptor,
Problem,
DeclarationDescriptor,
},
@ -590,7 +589,7 @@ fn resolve_local_name(
let fn_def = name_ref.syntax().ancestors().find_map(ast::FnDef::cast)?;
let function = FunctionDescriptor::guess_from_source(db, file_id, fn_def);
let scopes = function.scope(db);
let scope_entry = crate::hir::function::resolve_local_name(name_ref, &scopes)?;
let scope_entry = scopes.resolve_local_name(name_ref)?;
let syntax = db.resolve_syntax_ptr(scope_entry.ptr().into_global(file_id));
Some((scope_entry.name().clone(), syntax.range()))
}