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

make navigation target go to original file location

Browse source
This commit is contained in:
Jake Heinz 2021-11-27 13:48:50 +00:00
parent a7370c5725
commit e033d8c2a2
3 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide/src/navigation_target.rs
View file

@ -170,7 +170,7 @@ impl NavigationTarget {
impl ToNav for FileSymbol {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
NavigationTarget {
file_id: self.file_id.original_file(db),
file_id: self.original_file_id,
name: self.name.clone(),
kind: Some(match self.kind {
FileSymbolKind::Function => SymbolKind::Function,
@ -517,7 +517,7 @@ impl TryToNav for hir::ConstParam {
/// e.g. `struct Name`, `enum Name`, `fn Name`
pub(crate) fn description_from_symbol(db: &RootDatabase, symbol: &FileSymbol) -> Option<String> {
let sema = Semantics::new(db);
let syntax = sema.parse_or_expand(symbol.file_id)?;
let syntax = sema.parse_or_expand(symbol.hir_file_id)?;
let node = symbol.ptr.to_node(&syntax);
match_ast! {