diff options
Diffstat (limited to 'crates/ide/src/display/navigation_target.rs')
-rw-r--r-- | crates/ide/src/display/navigation_target.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/display/navigation_target.rs index 16fa828ad..23d885218 100644 --- a/crates/ide/src/display/navigation_target.rs +++ b/crates/ide/src/display/navigation_target.rs | |||
@@ -173,6 +173,7 @@ impl ToNav for FileSymbol { | |||
173 | FileSymbolKind::Const => SymbolKind::Const, | 173 | FileSymbolKind::Const => SymbolKind::Const, |
174 | FileSymbolKind::Static => SymbolKind::Static, | 174 | FileSymbolKind::Static => SymbolKind::Static, |
175 | FileSymbolKind::Macro => SymbolKind::Macro, | 175 | FileSymbolKind::Macro => SymbolKind::Macro, |
176 | FileSymbolKind::Union => SymbolKind::Union, | ||
176 | }), | 177 | }), |
177 | full_range: self.range, | 178 | full_range: self.range, |
178 | focus_range: self.name_range, | 179 | focus_range: self.name_range, |
@@ -434,13 +435,16 @@ impl TryToNav for hir::TypeParam { | |||
434 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { | 435 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { |
435 | let src = self.source(db)?; | 436 | let src = self.source(db)?; |
436 | let full_range = match &src.value { | 437 | let full_range = match &src.value { |
437 | Either::Left(it) => it.syntax().text_range(), | 438 | Either::Left(it) => it |
439 | .name() | ||
440 | .map_or_else(|| it.syntax().text_range(), |name| name.syntax().text_range()), | ||
438 | Either::Right(it) => it.syntax().text_range(), | 441 | Either::Right(it) => it.syntax().text_range(), |
439 | }; | 442 | }; |
440 | let focus_range = match &src.value { | 443 | let focus_range = match &src.value { |
441 | Either::Left(_) => None, | 444 | Either::Left(it) => it.name(), |
442 | Either::Right(it) => it.name().map(|it| it.syntax().text_range()), | 445 | Either::Right(it) => it.name(), |
443 | }; | 446 | } |
447 | .map(|it| it.syntax().text_range()); | ||
444 | Some(NavigationTarget { | 448 | Some(NavigationTarget { |
445 | file_id: src.file_id.original_file(db), | 449 | file_id: src.file_id.original_file(db), |
446 | name: self.name(db).to_string().into(), | 450 | name: self.name(db).to_string().into(), |