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

Cleanup FileId stuff

Browse source
This commit is contained in:
Lukas Wirth 2023-12-02 19:32:53 +01:00
parent 02a3a9438a
commit 81410ab500
5 changed files with 73 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,8 +169,13 @@ impl TryToNav for FileSymbol {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let full_range = self.loc.original_range(db);
let focus_range = self.loc.original_name_range(db);
let focus_range =
if focus_range.file_id == full_range.file_id { Some(focus_range.range) } else { None };
let focus_range = if focus_range.file_id == full_range.file_id
&& full_range.range.contains_range(focus_range.range)
{
Some(focus_range.range)
} else {
None
};
Some(NavigationTarget {
file_id: full_range.file_id,