bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/navigation_target.rs')
-rw-r--r--crates/ide/src/navigation_target.rs137
1 files changed, 57 insertions, 80 deletions
diff --git a/crates/ide/src/navigation_target.rs b/crates/ide/src/navigation_target.rs
index b222ff3eec..7d5d9057cb 100644
--- a/crates/ide/src/navigation_target.rs
+++ b/crates/ide/src/navigation_target.rs
@@ -6,7 +6,8 @@ use arrayvec::ArrayVec;
use either::Either;
use hir::{
AssocItem, Crate, FieldSource, HasContainer, HasCrate, HasSource, HirDisplay, HirFileId,
- InFile, LocalSource, ModuleSource, Semantics, db::ExpandDatabase, symbols::FileSymbol,
+ InFile, LocalSource, ModuleSource, Semantics, Symbol, db::ExpandDatabase, sym,
+ symbols::FileSymbol,
};
use ide_db::{
FileId, FileRange, RootDatabase, SymbolKind,
@@ -16,12 +17,10 @@ use ide_db::{
famous_defs::FamousDefs,
ra_fixture::UpmapFromRaFixture,
};
-use span::Edition;
use stdx::never;
use syntax::{
- AstNode, SmolStr, SyntaxNode, TextRange, ToSmolStr,
+ AstNode, SyntaxNode, TextRange,
ast::{self, HasName},
- format_smolstr,
};
/// `NavigationTarget` represents an element in the editor's UI which you can
@@ -48,17 +47,14 @@ pub struct NavigationTarget {
///
/// This range must be contained within [`Self::full_range`].
pub focus_range: Option<TextRange>,
- // FIXME: Symbol
- pub name: SmolStr,
+ pub name: Symbol,
pub kind: Option<SymbolKind>,
- // FIXME: Symbol
- pub container_name: Option<SmolStr>,
+ pub container_name: Option<Symbol>,
pub description: Option<String>,
pub docs: Option<Documentation>,
/// In addition to a `name` field, a `NavigationTarget` may also be aliased
/// In such cases we want a `NavigationTarget` to be accessible by its alias
- // FIXME: Symbol
- pub alias: Option<SmolStr>,
+ pub alias: Option<Symbol>,
}
impl fmt::Debug for NavigationTarget {
@@ -149,9 +145,7 @@ impl NavigationTarget {
db: &RootDatabase,
module: hir::Module,
) -> UpmappingResult<NavigationTarget> {
- let edition = module.krate().edition(db);
- let name =
- module.name(db).map(|it| it.display_no_db(edition).to_smolstr()).unwrap_or_default();
+ let name = module.name(db).map(|it| it.symbol().clone()).unwrap_or_else(|| sym::underscore);
match module.declaration_source(db) {
Some(InFile { value, file_id }) => {
orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
@@ -199,7 +193,8 @@ impl NavigationTarget {
InFile { file_id, value }: InFile<&dyn ast::HasName>,
kind: SymbolKind,
) -> UpmappingResult<NavigationTarget> {
- let name: SmolStr = value.name().map(|it| it.text().into()).unwrap_or_else(|| "_".into());
+ let name =
+ value.name().map(|it| Symbol::intern(&it.text())).unwrap_or_else(|| sym::underscore);
orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
|(FileRange { file_id, range: full_range }, focus_range)| {
@@ -210,7 +205,7 @@ impl NavigationTarget {
pub(crate) fn from_syntax(
file_id: FileId,
- name: SmolStr,
+ name: Symbol,
focus_range: Option<TextRange>,
full_range: TextRange,
kind: SymbolKind,
@@ -235,8 +230,6 @@ impl TryToNav for FileSymbol {
sema: &Semantics<'_, RootDatabase>,
) -> Option<UpmappingResult<NavigationTarget>> {
let db = sema.db;
- let edition =
- self.def.module(db).map(|it| it.krate().edition(db)).unwrap_or(Edition::CURRENT);
let display_target = self.def.krate(db).to_display_target(db);
Some(
orig_range_with_focus_r(
@@ -248,11 +241,12 @@ impl TryToNav for FileSymbol {
.map(|(FileRange { file_id, range: full_range }, focus_range)| {
NavigationTarget {
file_id,
- name: self.is_alias.then(|| self.def.name(db)).flatten().map_or_else(
- || self.name.as_str().into(),
- |it| it.display_no_db(edition).to_smolstr(),
- ),
- alias: self.is_alias.then(|| self.name.as_str().into()),
+ name: self
+ .is_alias
+ .then(|| self.def.name(db))
+ .flatten()
+ .map_or_else(|| self.name.clone(), |it| it.symbol().clone()),
+ alias: self.is_alias.then(|| self.name.clone()),
kind: Some(self.def.into()),
full_range,
focus_range,
@@ -349,52 +343,50 @@ impl TryToNav for hir::ModuleDef {
pub(crate) trait ToNavFromAst: Sized {
const KIND: SymbolKind;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
_ = db;
None
}
}
-fn container_name(db: &RootDatabase, t: impl HasContainer, edition: Edition) -> Option<SmolStr> {
+fn container_name(db: &RootDatabase, t: impl HasContainer) -> Option<Symbol> {
match t.container(db) {
- hir::ItemContainer::Trait(it) => Some(it.name(db).display_no_db(edition).to_smolstr()),
+ hir::ItemContainer::Trait(it) => Some(it.name(db).symbol().clone()),
// FIXME: Handle owners of blocks correctly here
- hir::ItemContainer::Module(it) => {
- it.name(db).map(|name| name.display_no_db(edition).to_smolstr())
- }
+ hir::ItemContainer::Module(it) => it.name(db).map(|name| name.symbol().clone()),
_ => None,
}
}
impl ToNavFromAst for hir::Function {
const KIND: SymbolKind = SymbolKind::Function;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Const {
const KIND: SymbolKind = SymbolKind::Const;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Static {
const KIND: SymbolKind = SymbolKind::Static;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Struct {
const KIND: SymbolKind = SymbolKind::Struct;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Enum {
const KIND: SymbolKind = SymbolKind::Enum;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Variant {
@@ -402,20 +394,20 @@ impl ToNavFromAst for hir::Variant {
}
impl ToNavFromAst for hir::Union {
const KIND: SymbolKind = SymbolKind::Union;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::TypeAlias {
const KIND: SymbolKind = SymbolKind::TypeAlias;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
impl ToNavFromAst for hir::Trait {
const KIND: SymbolKind = SymbolKind::Trait;
- fn container_name(self, db: &RootDatabase) -> Option<SmolStr> {
- container_name(db, self, self.krate(db).edition(db))
+ fn container_name(self, db: &RootDatabase) -> Option<Symbol> {
+ container_name(db, self)
}
}
@@ -451,10 +443,8 @@ where
impl ToNav for hir::Module {
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget> {
let InFile { file_id, value } = self.definition_source(db);
- let edition = self.krate(db).edition(db);
- let name =
- self.name(db).map(|it| it.display_no_db(edition).to_smolstr()).unwrap_or_default();
+ let name = self.name(db).map(|it| it.symbol().clone()).unwrap_or_else(|| sym::underscore);
let (syntax, focus) = match &value {
ModuleSource::SourceFile(node) => (node.syntax(), None),
ModuleSource::Module(node) => (node.syntax(), node.name()),
@@ -499,7 +489,7 @@ impl TryToNav for hir::Impl {
|(FileRange { file_id, range: full_range }, focus_range)| {
NavigationTarget::from_syntax(
file_id,
- "impl".into(),
+ sym::kw_impl,
focus_range,
full_range,
SymbolKind::Impl,
@@ -521,16 +511,12 @@ impl TryToNav for hir::ExternCrateDecl {
.rename()
.map_or_else(|| value.name_ref().map(Either::Left), |it| it.name().map(Either::Right));
let krate = self.module(db).krate();
- let edition = krate.edition(db);
Some(orig_range_with_focus(db, file_id, value.syntax(), focus).map(
|(FileRange { file_id, range: full_range }, focus_range)| {
let mut res = NavigationTarget::from_syntax(
file_id,
- self.alias_or_name(db)
- .unwrap_or_else(|| self.name(db))
- .display_no_db(edition)
- .to_smolstr(),
+ self.alias_or_name(db).unwrap_or_else(|| self.name(db)).symbol().clone(),
focus_range,
full_range,
SymbolKind::Module,
@@ -538,7 +524,7 @@ impl TryToNav for hir::ExternCrateDecl {
res.docs = self.docs(db);
res.description = Some(self.display(db, krate.to_display_target(db)).to_string());
- res.container_name = container_name(db, *self, edition);
+ res.container_name = container_name(db, *self);
res
},
))
@@ -570,7 +556,7 @@ impl TryToNav for hir::Field {
|(FileRange { file_id, range: full_range }, focus_range)| {
NavigationTarget::from_syntax(
file_id,
- format_smolstr!("{}", self.index()),
+ Symbol::integer(self.index()),
focus_range,
full_range,
SymbolKind::Field,
@@ -655,11 +641,10 @@ impl ToNav for LocalSource {
Either::Left(bind_pat) => (bind_pat.syntax(), bind_pat.name()),
Either::Right(it) => (it.syntax(), it.name()),
};
- let edition = self.local.parent(db).module(db).krate().edition(db);
orig_range_with_focus(db, file_id, node, name).map(
|(FileRange { file_id, range: full_range }, focus_range)| {
- let name = local.name(db).display_no_db(edition).to_smolstr();
+ let name = local.name(db).symbol().clone();
let kind = if local.is_self(db) {
SymbolKind::SelfParam
} else if local.is_param(db) {
@@ -696,8 +681,7 @@ impl TryToNav for hir::Label {
) -> Option<UpmappingResult<NavigationTarget>> {
let db = sema.db;
let InFile { file_id, value } = self.source(db)?;
- // Labels can't be keywords, so no escaping needed.
- let name = self.name(db).display_no_db(Edition::Edition2015).to_smolstr();
+ let name = self.name(db).symbol().clone();
Some(orig_range_with_focus(db, file_id, value.syntax(), value.lifetime()).map(
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
@@ -722,8 +706,7 @@ impl TryToNav for hir::TypeParam {
) -> Option<UpmappingResult<NavigationTarget>> {
let db = sema.db;
let InFile { file_id, value } = self.merge().source(db)?;
- let edition = self.module(db).krate().edition(db);
- let name = self.name(db).display_no_db(edition).to_smolstr();
+ let name = self.name(db).symbol().clone();
let value = match value {
Either::Left(ast::TypeOrConstParam::Type(x)) => Either::Left(x),
@@ -772,8 +755,7 @@ impl TryToNav for hir::LifetimeParam {
) -> Option<UpmappingResult<NavigationTarget>> {
let db = sema.db;
let InFile { file_id, value } = self.source(db)?;
- // Lifetimes cannot be keywords, so not escaping needed.
- let name = self.name(db).display_no_db(Edition::Edition2015).to_smolstr();
+ let name = self.name(db).symbol().clone();
Some(orig_range(db, file_id, value.syntax()).map(
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
@@ -798,8 +780,7 @@ impl TryToNav for hir::ConstParam {
) -> Option<UpmappingResult<NavigationTarget>> {
let db = sema.db;
let InFile { file_id, value } = self.merge().source(db)?;
- let edition = self.module(db).krate().edition(db);
- let name = self.name(db).display_no_db(edition).to_smolstr();
+ let name = self.name(db).symbol().clone();
let value = match value {
Either::Left(ast::TypeOrConstParam::Const(x)) => x,
@@ -834,21 +815,17 @@ impl TryToNav for hir::InlineAsmOperand {
let InFile { file_id, value } = &self.source(db)?;
let file_id = *file_id;
Some(orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
- |(FileRange { file_id, range: full_range }, focus_range)| {
- let edition = self.parent(db).module(db).krate().edition(db);
- NavigationTarget {
- file_id,
- name: self
- .name(db)
- .map_or_else(|| "_".into(), |it| it.display(db, edition).to_smolstr()),
- alias: None,
- kind: Some(SymbolKind::Local),
- full_range,
- focus_range,
- container_name: None,
- description: None,
- docs: None,
- }
+ |(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
+ file_id,
+ name:
+ self.name(db).map_or_else(|| sym::underscore.clone(), |it| it.symbol().clone()),
+ alias: None,
+ kind: Some(SymbolKind::Local),
+ full_range,
+ focus_range,
+ container_name: None,
+ description: None,
+ docs: None,
},
))
}