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

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

2
crates/ide_db/src/items_locator.rs
View file

@ -133,7 +133,7 @@ fn get_name_definition(
import_candidate: &FileSymbol, import_candidate: &FileSymbol,
) -> Option<Definition> { ) -> Option<Definition> {
let _p = profile::span("get_name_definition"); let _p = profile::span("get_name_definition");
let file_id = import_candidate.file_id; let file_id = import_candidate.hir_file_id;
let candidate_node = import_candidate.ptr.to_node(&sema.parse_or_expand(file_id)?); let candidate_node = import_candidate.ptr.to_node(&sema.parse_or_expand(file_id)?);
let candidate_name_node = if candidate_node.kind() != NAME { let candidate_name_node = if candidate_node.kind() != NAME {

42
crates/ide_db/src/symbol_index.rs
View file

@ -371,7 +371,8 @@ impl Query {
/// possible. /// possible.
#[derive(Debug, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct FileSymbol { pub struct FileSymbol {
pub file_id: HirFileId, pub hir_file_id: HirFileId,
pub original_file_id: FileId,
pub name: SmolStr, pub name: SmolStr,
pub kind: FileSymbolKind, pub kind: FileSymbolKind,
pub range: TextRange, pub range: TextRange,
@ -478,7 +479,8 @@ fn to_file_symbol(node: &SyntaxNode, file_id: FileId) -> Option<FileSymbol> {
}, },
range: node.text_range(), range: node.text_range(),
ptr, ptr,
file_id: file_id.into(), hir_file_id: file_id.into(),
original_file_id: file_id,
name_range: Some(name_range), name_range: Some(name_range),
container_name: None, container_name: None,
}) })
@ -505,10 +507,11 @@ fn collect_symbols_from_item_scope(
{ {
let loc = id.lookup(db); let loc = id.lookup(db);
let source = loc.source(db); let source = loc.source(db);
let name = source.value.name()?;
let file_id = loc.id.file_id();
let name_range = name.syntax().text_range(); let name = source.value.name()?;
let name_range = source.with_value(name.syntax()).original_file_range(db.upcast());
let hir_file_id = loc.id.file_id();
let name = name.text().into(); let name = name.text().into();
let ptr = SyntaxNodePtr::new(source.value.syntax()); let ptr = SyntaxNodePtr::new(source.value.syntax());
@ -532,10 +535,11 @@ fn collect_symbols_from_item_scope(
Some(FileSymbol { Some(FileSymbol {
name, name,
kind, kind,
range: source.value.syntax().text_range(), range: source.with_value(source.value.syntax()).original_file_range(db.upcast()).range,
container_name, container_name,
file_id, hir_file_id,
name_range: Some(name_range), original_file_id: name_range.file_id,
name_range: Some(name_range.range),
ptr, ptr,
}) })
} }
@ -548,18 +552,19 @@ fn collect_symbols_from_item_scope(
let loc = id.lookup(db); let loc = id.lookup(db);
let source = loc.source(db); let source = loc.source(db);
let name = source.value.name()?; let name = source.value.name()?;
let file_id = loc.id.file_id(); let name_range = source.with_value(name.syntax()).original_file_range(db.upcast());
let name_range = name.syntax().text_range(); let hir_file_id = loc.id.file_id();
let name = name.text().into(); let name = name.text().into();
let ptr = SyntaxNodePtr::new(source.value.syntax()); let ptr = SyntaxNodePtr::new(source.value.syntax());
Some(FileSymbol { Some(FileSymbol {
name, name,
kind, kind,
range: source.value.syntax().text_range(), range: source.with_value(source.value.syntax()).original_file_range(db.upcast()).range,
container_name: None, container_name: None,
file_id, hir_file_id,
name_range: Some(name_range), original_file_id: name_range.file_id,
name_range: Some(name_range.range),
ptr, ptr,
}) })
} }
@ -568,21 +573,22 @@ fn collect_symbols_from_item_scope(
let def_map = module_id.def_map(db); let def_map = module_id.def_map(db);
let module_data = &def_map[module_id.local_id]; let module_data = &def_map[module_id.local_id];
let declaration = module_data.origin.declaration()?; let declaration = module_data.origin.declaration()?;
let file_id = declaration.file_id; let hir_file_id = declaration.file_id;
let module = declaration.to_node(db.upcast()); let module = declaration.to_node(db.upcast());
let name = module.name()?; let name = module.name()?;
let name_range = name.syntax().text_range(); let name_range = declaration.with_value(name.syntax()).original_file_range(db.upcast());
let name = name.text().into(); let name = name.text().into();
let ptr = SyntaxNodePtr::new(module.syntax()); let ptr = SyntaxNodePtr::new(module.syntax());
Some(FileSymbol { Some(FileSymbol {
name, name,
kind: FileSymbolKind::Module, kind: FileSymbolKind::Module,
range: module.syntax().text_range(), range: declaration.with_value(module.syntax()).original_file_range(db.upcast()).range,
container_name: None, container_name: None,
file_id, hir_file_id,
name_range: Some(name_range), original_file_id: name_range.file_id,
name_range: Some(name_range.range),
ptr, ptr,
}) })
} }