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

start descriptors -> hir rename

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-27 21:45:42 +03:00
parent 9f08341aa4
commit d659b7a2f0
14 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ use salsa::{Database, ParallelDatabase};
use crate::{
completion::{completions, CompletionItem},
db::{self, FileSyntaxQuery, SyntaxDatabase},
descriptors::{
hir::{
function::{FnDescriptor, FnId},
module::{ModuleDescriptor, Problem},
DeclarationDescriptor, DescriptorDatabase,
@ -589,7 +589,7 @@ fn resolve_local_name(
let fn_def = name_ref.syntax().ancestors().find_map(ast::FnDef::cast)?;
let fn_id = FnId::get(db, file_id, fn_def);
let scopes = db.fn_scopes(fn_id);
let scope_entry = crate::descriptors::function::resolve_local_name(name_ref, &scopes)?;
let scope_entry = crate::hir::function::resolve_local_name(name_ref, &scopes)?;
let syntax = db.resolve_syntax_ptr(scope_entry.ptr().into_global(file_id));
Some((scope_entry.name().clone(), syntax.range()))
}