mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-26 11:59:49 +00:00
Allow navigation targets to be duplicated when the focus range lies in the macro definition site
This commit is contained in:
parent
9b7ec5e31b
commit
9cb13b6efb
38 changed files with 851 additions and 488 deletions
|
@ -2,6 +2,7 @@
|
|||
|
||||
use std::fmt;
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use either::Either;
|
||||
use hir::{
|
||||
db::ExpandDatabase, symbols::FileSymbol, AssocItem, FieldSource, HasContainer, HasSource,
|
||||
|
@ -72,15 +73,15 @@ impl fmt::Debug for NavigationTarget {
|
|||
}
|
||||
|
||||
pub(crate) trait ToNav {
|
||||
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget;
|
||||
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget>;
|
||||
}
|
||||
|
||||
pub(crate) trait TryToNav {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget>;
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>>;
|
||||
}
|
||||
|
||||
impl<T: TryToNav, U: TryToNav> TryToNav for Either<T, U> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
Either::Left(it) => it.try_to_nav(db),
|
||||
Either::Right(it) => it.try_to_nav(db),
|
||||
|
@ -93,23 +94,30 @@ impl NavigationTarget {
|
|||
self.focus_range.unwrap_or(self.full_range)
|
||||
}
|
||||
|
||||
pub(crate) fn from_module_to_decl(db: &RootDatabase, module: hir::Module) -> NavigationTarget {
|
||||
pub(crate) fn from_module_to_decl(
|
||||
db: &RootDatabase,
|
||||
module: hir::Module,
|
||||
) -> UpmappingResult<NavigationTarget> {
|
||||
let name = module.name(db).map(|it| it.to_smol_str()).unwrap_or_default();
|
||||
if let Some(InFile { value, file_id }) = &module.declaration_source(db) {
|
||||
let (file_id, full_range, focus_range) =
|
||||
orig_range_with_focus(db, *file_id, value.syntax(), value.name());
|
||||
let mut res = NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
name,
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Module,
|
||||
);
|
||||
res.docs = module.docs(db);
|
||||
res.description = Some(module.display(db).to_string());
|
||||
return res;
|
||||
match module.declaration_source(db) {
|
||||
Some(InFile { value, file_id }) => {
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
let mut res = NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
name.clone(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Module,
|
||||
);
|
||||
res.docs = module.docs(db);
|
||||
res.description = Some(module.display(db).to_string());
|
||||
res
|
||||
},
|
||||
)
|
||||
}
|
||||
_ => module.to_nav(db),
|
||||
}
|
||||
module.to_nav(db)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
@ -135,13 +143,14 @@ impl NavigationTarget {
|
|||
db: &RootDatabase,
|
||||
InFile { file_id, value }: InFile<&dyn ast::HasName>,
|
||||
kind: SymbolKind,
|
||||
) -> NavigationTarget {
|
||||
let name = value.name().map(|it| it.text().into()).unwrap_or_else(|| "_".into());
|
||||
) -> UpmappingResult<NavigationTarget> {
|
||||
let name: SmolStr = value.name().map(|it| it.text().into()).unwrap_or_else(|| "_".into());
|
||||
|
||||
let (file_id, full_range, focus_range) =
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.name());
|
||||
|
||||
NavigationTarget::from_syntax(file_id, name, focus_range, full_range, kind)
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
NavigationTarget::from_syntax(file_id, name.clone(), focus_range, full_range, kind)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
fn from_syntax(
|
||||
|
@ -166,49 +175,51 @@ impl NavigationTarget {
|
|||
}
|
||||
|
||||
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
|
||||
&& full_range.range.contains_range(focus_range.range)
|
||||
{
|
||||
Some(focus_range.range)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Some(NavigationTarget {
|
||||
file_id: full_range.file_id,
|
||||
name: self
|
||||
.is_alias
|
||||
.then(|| self.def.name(db))
|
||||
.flatten()
|
||||
.map_or_else(|| self.name.clone(), |it| it.to_smol_str()),
|
||||
alias: self.is_alias.then(|| self.name.clone()),
|
||||
kind: Some(hir::ModuleDefId::from(self.def).into()),
|
||||
full_range: full_range.range,
|
||||
focus_range,
|
||||
container_name: self.container_name.clone(),
|
||||
description: match self.def {
|
||||
hir::ModuleDef::Module(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Function(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Adt(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Variant(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Const(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Static(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Trait(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::TraitAlias(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::TypeAlias(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Macro(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::BuiltinType(_) => None,
|
||||
},
|
||||
docs: None,
|
||||
})
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let root = db.parse_or_expand(self.loc.hir_file_id);
|
||||
self.loc.ptr.to_node(&root);
|
||||
Some(
|
||||
orig_range_with_focus(
|
||||
db,
|
||||
self.loc.hir_file_id,
|
||||
&self.loc.ptr.to_node(&root),
|
||||
Some(self.loc.name_ptr.to_node(&root)),
|
||||
)
|
||||
.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.clone(), |it| it.to_smol_str()),
|
||||
alias: self.is_alias.then(|| self.name.clone()),
|
||||
kind: Some(hir::ModuleDefId::from(self.def).into()),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: self.container_name.clone(),
|
||||
description: match self.def {
|
||||
hir::ModuleDef::Module(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Function(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Adt(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Variant(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Const(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Static(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Trait(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::TraitAlias(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::TypeAlias(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::Macro(it) => Some(it.display(db).to_string()),
|
||||
hir::ModuleDef::BuiltinType(_) => None,
|
||||
},
|
||||
docs: None,
|
||||
}
|
||||
}),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for Definition {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
Definition::Local(it) => Some(it.to_nav(db)),
|
||||
Definition::Label(it) => Some(it.to_nav(db)),
|
||||
|
@ -236,7 +247,7 @@ impl TryToNav for Definition {
|
|||
}
|
||||
|
||||
impl TryToNav for hir::ModuleDef {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
hir::ModuleDef::Module(it) => Some(it.to_nav(db)),
|
||||
hir::ModuleDef::Function(it) => it.try_to_nav(db),
|
||||
|
@ -334,22 +345,26 @@ where
|
|||
D: HasSource + ToNavFromAst + Copy + HasDocs + HirDisplay,
|
||||
D::Ast: ast::HasName,
|
||||
{
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let src = self.source(db)?;
|
||||
let mut res = NavigationTarget::from_named(
|
||||
db,
|
||||
src.as_ref().map(|it| it as &dyn ast::HasName),
|
||||
D::KIND,
|
||||
);
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res.container_name = self.container_name(db);
|
||||
Some(res)
|
||||
Some(
|
||||
NavigationTarget::from_named(
|
||||
db,
|
||||
src.as_ref().map(|it| it as &dyn ast::HasName),
|
||||
D::KIND,
|
||||
)
|
||||
.map(|mut res| {
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res.container_name = self.container_name(db);
|
||||
res
|
||||
}),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToNav for hir::Module {
|
||||
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
|
||||
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget> {
|
||||
let InFile { file_id, value } = self.definition_source(db);
|
||||
|
||||
let name = self.name(db).map(|it| it.to_smol_str()).unwrap_or_default();
|
||||
|
@ -358,13 +373,23 @@ impl ToNav for hir::Module {
|
|||
ModuleSource::Module(node) => (node.syntax(), node.name()),
|
||||
ModuleSource::BlockExpr(node) => (node.syntax(), None),
|
||||
};
|
||||
let (file_id, full_range, focus_range) = orig_range_with_focus(db, file_id, syntax, focus);
|
||||
NavigationTarget::from_syntax(file_id, name, focus_range, full_range, SymbolKind::Module)
|
||||
|
||||
orig_range_with_focus(db, file_id, syntax, focus).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
name.clone(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Module,
|
||||
)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::Impl {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let InFile { file_id, value } = self.source(db)?;
|
||||
let derive_path = self.as_builtin_derive_path(db);
|
||||
|
||||
|
@ -373,82 +398,100 @@ impl TryToNav for hir::Impl {
|
|||
None => (file_id, value.self_ty(), value.syntax()),
|
||||
};
|
||||
|
||||
let (file_id, full_range, focus_range) = orig_range_with_focus(db, file_id, syntax, focus);
|
||||
Some(NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
"impl".into(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Impl,
|
||||
Some(orig_range_with_focus(db, file_id, syntax, focus).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
"impl".into(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Impl,
|
||||
)
|
||||
},
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::ExternCrateDecl {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let src = self.source(db)?;
|
||||
let InFile { file_id, value } = src;
|
||||
let focus = value
|
||||
.rename()
|
||||
.map_or_else(|| value.name_ref().map(Either::Left), |it| it.name().map(Either::Right));
|
||||
let (file_id, full_range, focus_range) =
|
||||
orig_range_with_focus(db, file_id, value.syntax(), focus);
|
||||
let mut res = NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
self.alias_or_name(db).unwrap_or_else(|| self.name(db)).to_smol_str(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Module,
|
||||
);
|
||||
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res.container_name = container_name(db, *self);
|
||||
Some(res)
|
||||
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)).to_smol_str(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Module,
|
||||
);
|
||||
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res.container_name = container_name(db, *self);
|
||||
res
|
||||
},
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::Field {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let src = self.source(db)?;
|
||||
|
||||
let field_source = match &src.value {
|
||||
FieldSource::Named(it) => {
|
||||
let mut res =
|
||||
NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field);
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res
|
||||
}
|
||||
FieldSource::Pos(it) => {
|
||||
let FileRange { file_id, range } =
|
||||
src.with_value(it.syntax()).original_file_range(db);
|
||||
NavigationTarget::from_syntax(file_id, "".into(), None, range, SymbolKind::Field)
|
||||
NavigationTarget::from_named(db, src.with_value(it), SymbolKind::Field).map(
|
||||
|mut res| {
|
||||
res.docs = self.docs(db);
|
||||
res.description = Some(self.display(db).to_string());
|
||||
res
|
||||
},
|
||||
)
|
||||
}
|
||||
FieldSource::Pos(it) => orig_range(db, src.file_id, it.syntax()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
NavigationTarget::from_syntax(
|
||||
file_id,
|
||||
format!("{}", self.index()).into(),
|
||||
focus_range,
|
||||
full_range,
|
||||
SymbolKind::Field,
|
||||
)
|
||||
},
|
||||
),
|
||||
};
|
||||
Some(field_source)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::Macro {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let src = self.source(db)?;
|
||||
let name_owner: &dyn ast::HasName = match &src.value {
|
||||
Either::Left(it) => it,
|
||||
Either::Right(it) => it,
|
||||
};
|
||||
let mut res = NavigationTarget::from_named(
|
||||
db,
|
||||
src.as_ref().with_value(name_owner),
|
||||
self.kind(db).into(),
|
||||
);
|
||||
res.docs = self.docs(db);
|
||||
Some(res)
|
||||
Some(
|
||||
NavigationTarget::from_named(
|
||||
db,
|
||||
src.as_ref().with_value(name_owner),
|
||||
self.kind(db).into(),
|
||||
)
|
||||
.map(|mut res| {
|
||||
res.docs = self.docs(db);
|
||||
res
|
||||
}),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::Adt {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
hir::Adt::Struct(it) => it.try_to_nav(db),
|
||||
hir::Adt::Union(it) => it.try_to_nav(db),
|
||||
|
@ -458,7 +501,7 @@ impl TryToNav for hir::Adt {
|
|||
}
|
||||
|
||||
impl TryToNav for hir::AssocItem {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
AssocItem::Function(it) => it.try_to_nav(db),
|
||||
AssocItem::Const(it) => it.try_to_nav(db),
|
||||
|
@ -468,7 +511,7 @@ impl TryToNav for hir::AssocItem {
|
|||
}
|
||||
|
||||
impl TryToNav for hir::GenericParam {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
match self {
|
||||
hir::GenericParam::TypeParam(it) => it.try_to_nav(db),
|
||||
hir::GenericParam::ConstParam(it) => it.try_to_nav(db),
|
||||
|
@ -478,7 +521,7 @@ impl TryToNav for hir::GenericParam {
|
|||
}
|
||||
|
||||
impl ToNav for LocalSource {
|
||||
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
|
||||
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget> {
|
||||
let InFile { file_id, value } = &self.source;
|
||||
let file_id = *file_id;
|
||||
let local = self.local;
|
||||
|
@ -487,60 +530,61 @@ impl ToNav for LocalSource {
|
|||
Either::Right(it) => (it.syntax(), it.name()),
|
||||
};
|
||||
|
||||
let (file_id, full_range, focus_range) = orig_range_with_focus(db, file_id, node, name);
|
||||
|
||||
let name = local.name(db).to_smol_str();
|
||||
let kind = if local.is_self(db) {
|
||||
SymbolKind::SelfParam
|
||||
} else if local.is_param(db) {
|
||||
SymbolKind::ValueParam
|
||||
} else {
|
||||
SymbolKind::Local
|
||||
};
|
||||
NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(kind),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
}
|
||||
orig_range_with_focus(db, file_id, node, name).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| {
|
||||
let name = local.name(db).to_smol_str();
|
||||
let kind = if local.is_self(db) {
|
||||
SymbolKind::SelfParam
|
||||
} else if local.is_param(db) {
|
||||
SymbolKind::ValueParam
|
||||
} else {
|
||||
SymbolKind::Local
|
||||
};
|
||||
NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(kind),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToNav for hir::Local {
|
||||
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
|
||||
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget> {
|
||||
self.primary_source(db).to_nav(db)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToNav for hir::Label {
|
||||
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
|
||||
fn to_nav(&self, db: &RootDatabase) -> UpmappingResult<NavigationTarget> {
|
||||
let InFile { file_id, value } = self.source(db);
|
||||
let name = self.name(db).to_smol_str();
|
||||
|
||||
let (file_id, full_range, focus_range) =
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.lifetime());
|
||||
|
||||
NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::Label),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
}
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.lifetime()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
|
||||
file_id,
|
||||
name: name.clone(),
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::Label),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::TypeParam {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let InFile { file_id, value } = self.merge().source(db)?;
|
||||
let name = self.name(db).to_smol_str();
|
||||
|
||||
|
@ -559,51 +603,51 @@ impl TryToNav for hir::TypeParam {
|
|||
};
|
||||
let focus = value.as_ref().either(|it| it.name(), |it| it.name());
|
||||
|
||||
let (file_id, full_range, focus_range) = orig_range_with_focus(db, file_id, syntax, focus);
|
||||
|
||||
Some(NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::TypeParam),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
})
|
||||
Some(orig_range_with_focus(db, file_id, syntax, focus).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
|
||||
file_id,
|
||||
name: name.clone(),
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::TypeParam),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
},
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::TypeOrConstParam {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
self.split(db).try_to_nav(db)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::LifetimeParam {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let InFile { file_id, value } = self.source(db)?;
|
||||
let name = self.name(db).to_smol_str();
|
||||
|
||||
let FileRange { file_id, range } =
|
||||
InFile::new(file_id, value.syntax()).original_file_range(db);
|
||||
Some(NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::LifetimeParam),
|
||||
full_range: range,
|
||||
focus_range: Some(range),
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
})
|
||||
Some(orig_range(db, file_id, value.syntax()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
|
||||
file_id,
|
||||
name: name.clone(),
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::LifetimeParam),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
},
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
impl TryToNav for hir::ConstParam {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
|
||||
fn try_to_nav(&self, db: &RootDatabase) -> Option<UpmappingResult<NavigationTarget>> {
|
||||
let InFile { file_id, value } = self.merge().source(db)?;
|
||||
let name = self.name(db).to_smol_str();
|
||||
|
||||
|
@ -615,46 +659,180 @@ impl TryToNav for hir::ConstParam {
|
|||
}
|
||||
};
|
||||
|
||||
let (file_id, full_range, focus_range) =
|
||||
orig_range_with_focus(db, file_id, value.syntax(), value.name());
|
||||
Some(NavigationTarget {
|
||||
file_id,
|
||||
name,
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::ConstParam),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
})
|
||||
Some(orig_range_with_focus(db, file_id, value.syntax(), value.name()).map(
|
||||
|(FileRange { file_id, range: full_range }, focus_range)| NavigationTarget {
|
||||
file_id,
|
||||
name: name.clone(),
|
||||
alias: None,
|
||||
kind: Some(SymbolKind::ConstParam),
|
||||
full_range,
|
||||
focus_range,
|
||||
container_name: None,
|
||||
description: None,
|
||||
docs: None,
|
||||
},
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct UpmappingResult<T> {
|
||||
/// The macro call site.
|
||||
pub call_site: T,
|
||||
/// The macro definition site, if relevant.
|
||||
pub def_site: Option<T>,
|
||||
}
|
||||
|
||||
impl<T> UpmappingResult<T> {
|
||||
pub fn call_site(self) -> T {
|
||||
self.call_site
|
||||
}
|
||||
|
||||
pub fn collect<FI: FromIterator<T>>(self) -> FI {
|
||||
FI::from_iter(self.into_iter())
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> IntoIterator for UpmappingResult<T> {
|
||||
type Item = T;
|
||||
|
||||
type IntoIter = <ArrayVec<T, 2> as IntoIterator>::IntoIter;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.def_site
|
||||
.into_iter()
|
||||
.chain(Some(self.call_site))
|
||||
.collect::<ArrayVec<_, 2>>()
|
||||
.into_iter()
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> UpmappingResult<T> {
|
||||
fn map<U>(self, f: impl Fn(T) -> U) -> UpmappingResult<U> {
|
||||
UpmappingResult { call_site: f(self.call_site), def_site: self.def_site.map(f) }
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the original range of the syntax node, and the range of the name mapped out of macro expansions
|
||||
/// Additionally verifies that the name span is in bounds and related to the original range.
|
||||
/// May return two results if the mapped node originates from a macro definition in which case the
|
||||
/// second result is the creating macro call.
|
||||
fn orig_range_with_focus(
|
||||
db: &RootDatabase,
|
||||
hir_file: HirFileId,
|
||||
value: &SyntaxNode,
|
||||
name: Option<impl AstNode>,
|
||||
) -> (FileId, TextRange, Option<TextRange>) {
|
||||
let FileRange { file_id, range } =
|
||||
match InFile::new(hir_file, value).original_file_range_opt(db) {
|
||||
Some((range, ctxt)) if ctxt.is_root() => range,
|
||||
_ => db
|
||||
.lookup_intern_macro_call(hir_file.macro_file().unwrap().macro_call_id)
|
||||
.kind
|
||||
.original_call_range(db),
|
||||
};
|
||||
let focus_range = name
|
||||
.and_then(|it| InFile::new(hir_file, it.syntax()).original_file_range_opt(db))
|
||||
.filter(|(frange, ctxt)| {
|
||||
ctxt.is_root() && frange.file_id == file_id && frange.range.contains_range(frange.range)
|
||||
})
|
||||
.map(|(frange, _ctxt)| frange.range);
|
||||
) -> UpmappingResult<(FileRange, Option<TextRange>)> {
|
||||
let Some(name) = name else { return orig_range(db, hir_file, value) };
|
||||
|
||||
(file_id, range, focus_range)
|
||||
let call_range = || {
|
||||
db.lookup_intern_macro_call(hir_file.macro_file().unwrap().macro_call_id)
|
||||
.kind
|
||||
.original_call_range(db)
|
||||
};
|
||||
|
||||
let def_range = || {
|
||||
db.lookup_intern_macro_call(hir_file.macro_file().unwrap().macro_call_id)
|
||||
.def
|
||||
.definition_range(db)
|
||||
};
|
||||
|
||||
// FIXME What about include!d things
|
||||
|
||||
let value_range = InFile::new(hir_file, value).original_file_range_opt(db);
|
||||
let ((call_site_range, call_site_focus), def_site) =
|
||||
match InFile::new(hir_file, name.syntax()).original_file_range_opt(db) {
|
||||
// call site name
|
||||
Some((focus_range, ctxt)) if ctxt.is_root() => {
|
||||
// Try to upmap the node as well, if it ends up in the def site, go back to the call site
|
||||
(
|
||||
(
|
||||
match value_range {
|
||||
// name is in the node in the macro input so we can return it
|
||||
Some((range, ctxt))
|
||||
if ctxt.is_root()
|
||||
&& range.file_id == focus_range.file_id
|
||||
&& range.range.contains_range(focus_range.range) =>
|
||||
{
|
||||
range
|
||||
}
|
||||
// name lies outside the node, so instead point to the macro call which
|
||||
// *should* contain the name
|
||||
_ => call_range(),
|
||||
},
|
||||
Some(focus_range),
|
||||
),
|
||||
// no def site relevant
|
||||
None,
|
||||
)
|
||||
}
|
||||
|
||||
// def site name
|
||||
// FIXME: This can be de improved
|
||||
Some((focus_range, _ctxt)) => {
|
||||
match value_range {
|
||||
// but overall node is in macro input
|
||||
Some((range, ctxt)) if ctxt.is_root() => (
|
||||
// node mapped up in call site, show the node
|
||||
(range, None),
|
||||
// def site, if the name is in the (possibly) upmapped def site range, show the
|
||||
// def site
|
||||
{
|
||||
let (def_site, _) = def_range().original_node_file_range(db);
|
||||
(def_site.file_id == focus_range.file_id
|
||||
&& def_site.range.contains_range(focus_range.range))
|
||||
.then_some((def_site, Some(focus_range)))
|
||||
},
|
||||
),
|
||||
// node is in macro def, just show the focus
|
||||
_ => (
|
||||
// show the macro call
|
||||
(call_range(), None),
|
||||
Some((focus_range, Some(focus_range))),
|
||||
),
|
||||
}
|
||||
}
|
||||
// lost name? can't happen for single tokens
|
||||
None => return orig_range(db, hir_file, value),
|
||||
};
|
||||
|
||||
UpmappingResult {
|
||||
call_site: (
|
||||
call_site_range,
|
||||
call_site_focus.and_then(|FileRange { file_id, range }| {
|
||||
if call_site_range.file_id == file_id && call_site_range.range.contains_range(range)
|
||||
{
|
||||
Some(range)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}),
|
||||
),
|
||||
def_site: def_site.map(|(def_site_range, def_site_focus)| {
|
||||
(
|
||||
def_site_range,
|
||||
def_site_focus.and_then(|FileRange { file_id, range }| {
|
||||
if def_site_range.file_id == file_id
|
||||
&& def_site_range.range.contains_range(range)
|
||||
{
|
||||
Some(range)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}),
|
||||
)
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn orig_range(
|
||||
db: &RootDatabase,
|
||||
hir_file: HirFileId,
|
||||
value: &SyntaxNode,
|
||||
) -> UpmappingResult<(FileRange, Option<TextRange>)> {
|
||||
UpmappingResult {
|
||||
call_site: (InFile::new(hir_file, value).original_file_range(db), None),
|
||||
def_site: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue