From d49924dc6e3c236e305c28cb630d5f2888a7e363 Mon Sep 17 00:00:00 2001 From: Ali Bektas Date: Fri, 26 May 2023 13:24:44 +0200 Subject: [PATCH] Choose & over ref, make nav target's name more intuitive. --- crates/ide/src/navigation_target.rs | 2 +- crates/rust-analyzer/src/handlers/request.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/ide/src/navigation_target.rs b/crates/ide/src/navigation_target.rs index 65c37ca68c5..7ec7788a245 100644 --- a/crates/ide/src/navigation_target.rs +++ b/crates/ide/src/navigation_target.rs @@ -169,7 +169,7 @@ impl TryToNav for FileSymbol { Some(NavigationTarget { file_id: full_range.file_id, - name: self.def.name(db)?.to_smol_str(), + name: if self.is_alias { self.def.name(db)?.to_smol_str() } else { self.name.clone() }, alias: if self.is_alias { Some(self.name.clone()) } else { None }, kind: Some(hir::ModuleDefId::from(self.def).into()), full_range: full_range.range, diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs index c8eda567db7..eabc39b3e09 100644 --- a/crates/rust-analyzer/src/handlers/request.rs +++ b/crates/rust-analyzer/src/handlers/request.rs @@ -520,8 +520,8 @@ pub(crate) fn handle_workspace_symbol( #[allow(deprecated)] let info = SymbolInformation { - name: match nav.alias { - Some(ref alias) => format!("{} (alias {})", alias, nav.name), + name: match &nav.alias { + Some(alias) => format!("{} (alias for {})", alias, nav.name), None => format!("{}", nav.name), }, kind: nav