diff options
Diffstat (limited to 'crates/ra_ide_api/src/display')
-rw-r--r-- | crates/ra_ide_api/src/display/navigation_target.rs | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs index 3333771ab..a036a3b36 100644 --- a/crates/ra_ide_api/src/display/navigation_target.rs +++ b/crates/ra_ide_api/src/display/navigation_target.rs | |||
@@ -212,24 +212,8 @@ impl NavigationTarget { | |||
212 | hir::ModuleDef::Struct(it) => NavigationTarget::from_adt_def(db, it.into()), | 212 | hir::ModuleDef::Struct(it) => NavigationTarget::from_adt_def(db, it.into()), |
213 | hir::ModuleDef::Enum(it) => NavigationTarget::from_adt_def(db, it.into()), | 213 | hir::ModuleDef::Enum(it) => NavigationTarget::from_adt_def(db, it.into()), |
214 | hir::ModuleDef::Union(it) => NavigationTarget::from_adt_def(db, it.into()), | 214 | hir::ModuleDef::Union(it) => NavigationTarget::from_adt_def(db, it.into()), |
215 | hir::ModuleDef::Const(s) => { | 215 | hir::ModuleDef::Const(it) => NavigationTarget::from_def_source(db, it), |
216 | let (file_id, node) = s.source(db); | 216 | hir::ModuleDef::Static(it) => NavigationTarget::from_def_source(db, it), |
217 | NavigationTarget::from_named( | ||
218 | file_id.original_file(db), | ||
219 | &*node, | ||
220 | node.doc_comment_text(), | ||
221 | node.short_label(), | ||
222 | ) | ||
223 | } | ||
224 | hir::ModuleDef::Static(s) => { | ||
225 | let (file_id, node) = s.source(db); | ||
226 | NavigationTarget::from_named( | ||
227 | file_id.original_file(db), | ||
228 | &*node, | ||
229 | node.doc_comment_text(), | ||
230 | node.short_label(), | ||
231 | ) | ||
232 | } | ||
233 | hir::ModuleDef::EnumVariant(var) => { | 217 | hir::ModuleDef::EnumVariant(var) => { |
234 | let src = var.source(db); | 218 | let src = var.source(db); |
235 | NavigationTarget::from_named( | 219 | NavigationTarget::from_named( |
@@ -281,16 +265,8 @@ impl NavigationTarget { | |||
281 | 265 | ||
282 | pub(crate) fn from_impl_item(db: &RootDatabase, impl_item: hir::ImplItem) -> NavigationTarget { | 266 | pub(crate) fn from_impl_item(db: &RootDatabase, impl_item: hir::ImplItem) -> NavigationTarget { |
283 | match impl_item { | 267 | match impl_item { |
284 | ImplItem::Method(f) => NavigationTarget::from_function(db, f), | 268 | ImplItem::Method(it) => NavigationTarget::from_function(db, it), |
285 | ImplItem::Const(c) => { | 269 | ImplItem::Const(it) => NavigationTarget::from_def_source(db, it), |
286 | let (file_id, node) = c.source(db); | ||
287 | NavigationTarget::from_named( | ||
288 | file_id.original_file(db), | ||
289 | &*node, | ||
290 | node.doc_comment_text(), | ||
291 | node.short_label(), | ||
292 | ) | ||
293 | } | ||
294 | ImplItem::TypeAlias(a) => { | 270 | ImplItem::TypeAlias(a) => { |
295 | let (file_id, node) = a.source(db); | 271 | let (file_id, node) = a.source(db); |
296 | NavigationTarget::from_named( | 272 | NavigationTarget::from_named( |