aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/navigation_target.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-01-13 18:56:20 +0000
committerAleksey Kladov <[email protected]>2019-01-13 18:56:20 +0000
commit077a02271c855841be39d4b6b45b7df14a6fc067 (patch)
tree72e29840557575a3745bd773142d2a6ef759d722 /crates/ra_ide_api/src/navigation_target.rs
parent4209022e5b8dc185b098d76fd6701cd046b7c37d (diff)
fix go to parent module
Diffstat (limited to 'crates/ra_ide_api/src/navigation_target.rs')
-rw-r--r--crates/ra_ide_api/src/navigation_target.rs19
1 files changed, 19 insertions, 0 deletions
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/navigation_target.rs
index b0d0a3e8b..230d0f67a 100644
--- a/crates/ra_ide_api/src/navigation_target.rs
+++ b/crates/ra_ide_api/src/navigation_target.rs
@@ -89,6 +89,25 @@ impl NavigationTarget {
89 Ok(res) 89 Ok(res)
90 } 90 }
91 91
92 pub(crate) fn from_module_to_decl(
93 db: &RootDatabase,
94 module: hir::Module,
95 ) -> Cancelable<NavigationTarget> {
96 let name = module
97 .name(db)?
98 .map(|it| it.to_string().into())
99 .unwrap_or_default();
100 if let Some((file_id, source)) = module.declaration_source(db)? {
101 return Ok(NavigationTarget::from_syntax(
102 file_id,
103 name,
104 None,
105 source.syntax(),
106 ));
107 }
108 NavigationTarget::from_module(db, module)
109 }
110
92 // TODO once Def::Item is gone, this should be able to always return a NavigationTarget 111 // TODO once Def::Item is gone, this should be able to always return a NavigationTarget
93 pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> { 112 pub(crate) fn from_def(db: &RootDatabase, def: Def) -> Cancelable<Option<NavigationTarget>> {
94 let res = match def { 113 let res = match def {