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

Move NameRef classification logic out of reference_definition

Browse source
This commit is contained in:
Laurențiu Nicola 2019-05-22 19:49:22 +03:00
parent a25e103e45
commit 444e52e519
5 changed files with 144 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ra_ide_api/src/display/navigation_target.rs
View file

@ -5,7 +5,7 @@ use ra_syntax::{
ast::{self, NameOwner, VisibilityOwner, TypeAscriptionOwner},
algo::visit::{visitor, Visitor},
};
use hir::{ModuleSource, FieldSource, ImplItem, Either};
use hir::{ModuleSource, FieldSource, ImplItem};
use crate::{FileSymbol, db::RootDatabase};
@ -77,17 +77,12 @@ impl NavigationTarget {
pub(crate) fn from_pat(
db: &RootDatabase,
file_id: FileId,
pat: Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>,
pat: AstPtr<ast::Pat>,
) -> NavigationTarget {
let file = db.parse(file_id);
let (name, full_range) = match pat {
Either::A(pat) => match pat.to_node(file.syntax()).kind() {
ast::PatKind::BindPat(pat) => {
return NavigationTarget::from_bind_pat(file_id, &pat)
}
_ => ("_".into(), pat.syntax_node_ptr().range()),
},
Either::B(slf) => ("self".into(), slf.syntax_node_ptr().range()),
let (name, full_range) = match pat.to_node(file.syntax()).kind() {
ast::PatKind::BindPat(pat) => return NavigationTarget::from_bind_pat(file_id, &pat),
_ => ("_".into(), pat.syntax_node_ptr().range()),
};
NavigationTarget {
file_id,
@ -99,6 +94,21 @@ impl NavigationTarget {
}
}
pub(crate) fn from_self_param(
file_id: FileId,
par: AstPtr<ast::SelfParam>,
) -> NavigationTarget {
let (name, full_range) = ("self".into(), par.syntax_node_ptr().range());
NavigationTarget {
file_id,
name,
full_range,
focus_range: None,
kind: NAME,
container_name: None,
}
}
pub(crate) fn from_module(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
let (file_id, source) = module.definition_source(db);
let file_id = file_id.as_original_file();