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

reshuffle nones

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-11 13:29:53 +03:00
parent 7b14377965
commit a5dd04078e
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/ra_ide_api/src/navigation_target.rs
View file

@ -24,34 +24,22 @@ impl NavigationTarget {
// TODO once Def::Item is gone, this should be able to always return a NavigationTarget // TODO once Def::Item is gone, this should be able to always return a NavigationTarget
pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> { pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> {
Ok(match def { let res = match def {
Def::Struct(s) => { Def::Struct(s) => {
let (file_id, node) = s.source(db)?; let (file_id, node) = s.source(db)?;
Some(NavigationTarget::from_named( NavigationTarget::from_named(file_id.original_file(db), &*node)
file_id.original_file(db),
&*node,
))
} }
Def::Enum(e) => { Def::Enum(e) => {
let (file_id, node) = e.source(db)?; let (file_id, node) = e.source(db)?;
Some(NavigationTarget::from_named( NavigationTarget::from_named(file_id.original_file(db), &*node)
file_id.original_file(db),
&*node,
))
} }
Def::EnumVariant(ev) => { Def::EnumVariant(ev) => {
let (file_id, node) = ev.source(db)?; let (file_id, node) = ev.source(db)?;
Some(NavigationTarget::from_named( NavigationTarget::from_named(file_id.original_file(db), &*node)
file_id.original_file(db),
&*node,
))
} }
Def::Function(f) => { Def::Function(f) => {
let (file_id, node) = f.source(db)?; let (file_id, node) = f.source(db)?;
Some(NavigationTarget::from_named( NavigationTarget::from_named(file_id.original_file(db), &*node)
file_id.original_file(db),
&*node,
))
} }
Def::Module(m) => { Def::Module(m) => {
let (file_id, source) = m.definition_source(db)?; let (file_id, source) = m.definition_source(db)?;
@ -61,15 +49,16 @@ impl NavigationTarget {
.unwrap_or_else(|| SmolStr::new("")); .unwrap_or_else(|| SmolStr::new(""));
match source { match source {
ModuleSource::SourceFile(node) => { ModuleSource::SourceFile(node) => {
Some(NavigationTarget::from_syntax(file_id, name, node.syntax())) NavigationTarget::from_syntax(file_id, name, node.syntax())
} }
ModuleSource::Module(node) => { ModuleSource::Module(node) => {
Some(NavigationTarget::from_syntax(file_id, name, node.syntax())) NavigationTarget::from_syntax(file_id, name, node.syntax())
} }
} }
} }
Def::Item => None, Def::Item => return Ok(None),
}) };
Ok(Some(res))
} }
fn from_named(file_id: FileId, node: &impl ast::NameOwner) -> NavigationTarget { fn from_named(file_id: FileId, node: &impl ast::NameOwner) -> NavigationTarget {