mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some TryToNav impls not upmapping ranges out of macros

Browse Source
This commit is contained in:
Lukas Wirth 2021-12-07 15:02:22 +01:00
parent 49b0970970
commit b66f181bc0
1 changed files with 89 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
crates/ide/src/navigation_target.rs
View File

@ -91,18 +91,17 @@ impl NavigationTarget {
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) -> NavigationTarget {
let name = module.name(db).map(|it| it.to_smol_str()).unwrap_or_default(); let name = module.name(db).map(|it| it.to_smol_str()).unwrap_or_default();
if let Some(src) = module.declaration_source(db) { if let Some(src @ InFile { value, .. }) = &module.declaration_source(db) {
let node = src.syntax(); let FileRange { file_id, range: full_range } = src.syntax().original_file_range(db);
let full_range = node.original_file_range(db); let focus_range = value
let focus_range = src
.value
.name() .name()
.map(|name| src.with_value(name.syntax()).original_file_range(db).range); .and_then(|name| src.with_value(name.syntax()).original_file_range_opt(db))
.map(|it| it.range);
let mut res = NavigationTarget::from_syntax( let mut res = NavigationTarget::from_syntax(
full_range.file_id, file_id,
name, name,
focus_range, focus_range,
full_range.range, full_range,
SymbolKind::Module, SymbolKind::Module,
); );
res.docs = module.attrs(db).docs(); res.docs = module.attrs(db).docs();
@ -142,9 +141,9 @@ impl NavigationTarget {
.name() .name()
.and_then(|it| node.with_value(it.syntax()).original_file_range_opt(db)) .and_then(|it| node.with_value(it.syntax()).original_file_range_opt(db))
.map(|it| it.range); .map(|it| it.range);
let frange = node.map(|it| it.syntax()).original_file_range(db); let FileRange { file_id, range } = node.map(|it| it.syntax()).original_file_range(db);
NavigationTarget::from_syntax(frange.file_id, name, focus_range, frange.range, kind) NavigationTarget::from_syntax(file_id, name, focus_range, range, kind)
} }
fn from_syntax( fn from_syntax(
@ -287,39 +286,49 @@ where
impl ToNav for hir::Module { impl ToNav for hir::Module {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
let src = self.definition_source(db); let InFile { file_id, value } = self.definition_source(db);
let name = self.name(db).map(|it| it.to_smol_str()).unwrap_or_default(); let name = self.name(db).map(|it| it.to_smol_str()).unwrap_or_default();
let (syntax, focus) = match &src.value { let (syntax, focus) = match &value {
ModuleSource::SourceFile(node) => (node.syntax(), None), ModuleSource::SourceFile(node) => (node.syntax(), None),
ModuleSource::Module(node) => { ModuleSource::Module(node) => (
(node.syntax(), node.name().map(|it| it.syntax().text_range())) node.syntax(),
} node.name()
.and_then(|it| InFile::new(file_id, it.syntax()).original_file_range_opt(db))
.map(|it| it.range),
),
ModuleSource::BlockExpr(node) => (node.syntax(), None), ModuleSource::BlockExpr(node) => (node.syntax(), None),
}; };
let frange = src.with_value(syntax).original_file_range(db); let FileRange { file_id, range: full_range } =
NavigationTarget::from_syntax(frange.file_id, name, focus, frange.range, SymbolKind::Module) InFile::new(file_id, syntax).original_file_range(db);
NavigationTarget::from_syntax(file_id, name, focus, full_range, SymbolKind::Module)
} }
} }
impl TryToNav for hir::Impl { impl TryToNav for hir::Impl {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let src = self.source(db)?; let InFile { file_id, value } = self.source(db)?;
let derive_attr = self.is_builtin_derive(db); let derive_attr = self.is_builtin_derive(db);
let frange = match &derive_attr {
Some(item) => item.syntax().original_file_range(db), let range = |syntax: &_| InFile::new(file_id, syntax).original_file_range(db);
None => src.syntax().original_file_range(db),
};
let focus_range = if derive_attr.is_some() { let focus_range = if derive_attr.is_some() {
None None
} else { } else {
src.value.self_ty().map(|ty| src.with_value(ty.syntax()).original_file_range(db).range) value
.self_ty()
.and_then(|ty| InFile::new(file_id, ty.syntax()).original_file_range_opt(db))
.map(|it| it.range)
};
let FileRange { file_id, range: full_range } = match &derive_attr {
Some(InFile { value, .. }) => range(value.syntax()),
None => range(value.syntax()),
}; };
Some(NavigationTarget::from_syntax( Some(NavigationTarget::from_syntax(
frange.file_id, file_id,
"impl".into(), "impl".into(),
focus_range, focus_range,
frange.range, full_range,
SymbolKind::Impl, SymbolKind::Impl,
)) ))
} }
@ -338,14 +347,9 @@ impl TryToNav for hir::Field {
res res
} }
FieldSource::Pos(it) => { FieldSource::Pos(it) => {
let frange = src.with_value(it.syntax()).original_file_range(db); let FileRange { file_id, range } =
NavigationTarget::from_syntax( src.with_value(it.syntax()).original_file_range(db);
frange.file_id, NavigationTarget::from_syntax(file_id, "".into(), None, range, SymbolKind::Field)
"".into(),
None,
frange.range,
SymbolKind::Field,
)
} }
}; };
Some(field_source) Some(field_source)
@ -408,15 +412,17 @@ impl TryToNav for hir::GenericParam {
impl ToNav for hir::Local { impl ToNav for hir::Local {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
let src = self.source(db); let InFile { file_id, value } = self.source(db);
let (node, name) = match &src.value { let (node, name) = match &value {
Either::Left(bind_pat) => (bind_pat.syntax().clone(), bind_pat.name()), Either::Left(bind_pat) => (bind_pat.syntax(), bind_pat.name()),
Either::Right(it) => (it.syntax().clone(), it.name()), Either::Right(it) => (it.syntax(), it.name()),
}; };
let focus_range = let focus_range = name
name.map(|it| src.with_value(&it.syntax().clone()).original_file_range(db).range); .and_then(|it| InFile::new(file_id, it.syntax()).original_file_range_opt(db))
.map(|it| it.range);
let FileRange { file_id, range: full_range } =
InFile::new(file_id, node).original_file_range(db);
let full_range = src.with_value(&node).original_file_range(db);
let name = match self.name(db) { let name = match self.name(db) {
Some(it) => it.to_smol_str(), Some(it) => it.to_smol_str(),
None => "".into(), None => "".into(),
@ -429,10 +435,10 @@ impl ToNav for hir::Local {
SymbolKind::Local SymbolKind::Local
}; };
NavigationTarget { NavigationTarget {
file_id: full_range.file_id, file_id,
name, name,
kind: Some(kind), kind: Some(kind),
full_range: full_range.range, full_range,
focus_range, focus_range,
container_name: None, container_name: None,
description: None, description: None,
@ -443,17 +449,18 @@ impl ToNav for hir::Local {
impl ToNav for hir::Label { impl ToNav for hir::Label {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
let src = self.source(db); let InFile { file_id, value } = self.source(db);
let node = src.value.syntax();
let FileRange { file_id, range } = src.with_value(node).original_file_range(db);
let focus_range =
src.value.lifetime().and_then(|lt| lt.lifetime_ident_token()).map(|lt| lt.text_range());
let name = self.name(db).to_smol_str(); let name = self.name(db).to_smol_str();
let range = |syntax: &_| InFile::new(file_id, syntax).original_file_range(db);
let FileRange { file_id, range: full_range } = range(value.syntax());
let focus_range = value.lifetime().map(|lt| range(lt.syntax()).range);
NavigationTarget { NavigationTarget {
file_id, file_id,
name, name,
kind: Some(SymbolKind::Label), kind: Some(SymbolKind::Label),
full_range: range, full_range,
focus_range, focus_range,
container_name: None, container_name: None,
description: None, description: None,
@ -464,21 +471,25 @@ impl ToNav for hir::Label {
impl TryToNav for hir::TypeParam { impl TryToNav for hir::TypeParam {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let src = self.source(db)?; let InFile { file_id, value } = self.source(db)?;
let full_range = match &src.value { let name = self.name(db).to_smol_str();
Either::Left(type_param) => type_param.syntax().text_range(),
let range = |syntax: &_| InFile::new(file_id, syntax).original_file_range(db);
let focus_range = |syntax: &_| InFile::new(file_id, syntax).original_file_range_opt(db);
let FileRange { file_id, range: full_range } = match &value {
Either::Left(type_param) => range(type_param.syntax()),
Either::Right(trait_) => trait_ Either::Right(trait_) => trait_
.name() .name()
.map_or_else(|| trait_.syntax().text_range(), |name| name.syntax().text_range()), .and_then(|name| focus_range(name.syntax()))
.unwrap_or_else(|| range(trait_.syntax())),
}; };
let focus_range = match &src.value { let focus_range = value
Either::Left(it) => it.name(), .either(|it| it.name(), |it| it.name())
Either::Right(it) => it.name(), .and_then(|it| focus_range(it.syntax()))
} .map(|it| it.range);
.map(|it| it.syntax().text_range());
Some(NavigationTarget { Some(NavigationTarget {
file_id: src.file_id.original_file(db), file_id,
name: self.name(db).to_smol_str(), name,
kind: Some(SymbolKind::TypeParam), kind: Some(SymbolKind::TypeParam),
full_range, full_range,
focus_range, focus_range,
@ -491,11 +502,14 @@ impl TryToNav for hir::TypeParam {
impl TryToNav for hir::LifetimeParam { impl TryToNav for hir::LifetimeParam {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let src = self.source(db)?; let InFile { file_id, value } = self.source(db)?;
let full_range = src.value.syntax().text_range(); let name = self.name(db).to_smol_str();
let FileRange { file_id, range: full_range } =
InFile::new(file_id, value.syntax()).original_file_range(db);
Some(NavigationTarget { Some(NavigationTarget {
file_id: src.file_id.original_file(db), file_id,
name: self.name(db).to_smol_str(), name,
kind: Some(SymbolKind::LifetimeParam), kind: Some(SymbolKind::LifetimeParam),
full_range, full_range,
focus_range: Some(full_range), focus_range: Some(full_range),
@ -508,14 +522,21 @@ impl TryToNav for hir::LifetimeParam {
impl TryToNav for hir::ConstParam { impl TryToNav for hir::ConstParam {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let src = self.source(db)?; let InFile { file_id, value } = self.source(db)?;
let full_range = src.value.syntax().text_range(); let name = self.name(db).to_smol_str();
let focus_range = value
.name()
.and_then(|it| InFile::new(file_id, it.syntax()).original_file_range_opt(db))
.map(|it| it.range);
let FileRange { file_id, range: full_range } =
InFile::new(file_id, value.syntax()).original_file_range(db);
Some(NavigationTarget { Some(NavigationTarget {
file_id: src.file_id.original_file(db), file_id,
name: self.name(db).to_smol_str(), name,
kind: Some(SymbolKind::ConstParam), kind: Some(SymbolKind::ConstParam),
full_range, full_range,
focus_range: src.value.name().map(|n| n.syntax().text_range()), focus_range,
container_name: None, container_name: None,
description: None, description: None,
docs: None, docs: None,