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

remove dead code

Browse source
This commit is contained in:
hamidreza kalbasi 2021-09-22 11:44:23 +03:30
parent 569ac5bee1
commit 18e6b508dd
1 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/ide/src/goto_definition.rs
View file

@ -1,16 +1,15 @@
use std::{convert::TryInto, iter}; use std::convert::TryInto;
use crate::hover::find_definition; use crate::hover::find_definition;
use crate::{ use crate::{
display::{ToNav, TryToNav}, display::TryToNav,
doc_links::{doc_attributes, extract_definitions_from_docs, resolve_doc_path_for_def}, doc_links::{doc_attributes, extract_definitions_from_docs, resolve_doc_path_for_def},
FilePosition, NavigationTarget, RangeInfo, FilePosition, NavigationTarget, RangeInfo,
}; };
use either::Either;
use hir::{AsAssocItem, InFile, ModuleDef, Semantics}; use hir::{AsAssocItem, InFile, ModuleDef, Semantics};
use ide_db::{ use ide_db::{
base_db::{AnchoredPath, FileId, FileLoader}, base_db::{AnchoredPath, FileId, FileLoader},
defs::{Definition, NameClass, NameRefClass}, defs::Definition,
helpers::{pick_best_token, try_resolve_derive_input_at}, helpers::{pick_best_token, try_resolve_derive_input_at},
RootDatabase, RootDatabase,
}; };
@ -151,37 +150,10 @@ fn try_find_trait_item_definition(
.map(|it| vec![it]) .map(|it| vec![it])
} }
pub(crate) fn reference_definition(
sema: &Semantics<RootDatabase>,
name_ref: Either<&ast::Lifetime, &ast::NameRef>,
) -> Vec<NavigationTarget> {
let name_kind = match name_ref.either(
|lifetime| NameRefClass::classify_lifetime(sema, lifetime),
|name_ref| NameRefClass::classify(sema, name_ref),
) {
Some(class) => class,
None => return Vec::new(),
};
match name_kind {
NameRefClass::Definition(def) => def_to_nav(sema.db, def),
NameRefClass::FieldShorthand { local_ref, field_ref } => {
local_and_field_to_nav(sema.db, local_ref, field_ref)
}
}
}
fn def_to_nav(db: &RootDatabase, def: Definition) -> Vec<NavigationTarget> { fn def_to_nav(db: &RootDatabase, def: Definition) -> Vec<NavigationTarget> {
def.try_to_nav(db).map(|it| vec![it]).unwrap_or_default() def.try_to_nav(db).map(|it| vec![it]).unwrap_or_default()
} }
fn local_and_field_to_nav(
db: &RootDatabase,
local: hir::Local,
field: hir::Field,
) -> Vec<NavigationTarget> {
iter::once(local.to_nav(db)).chain(field.try_to_nav(db)).collect()
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use ide_db::base_db::FileRange; use ide_db::base_db::FileRange;