language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

HasSource::source_old -> HasSource::source for places where proc-macros were special cased

Browse source 
In #6901 some special case handling for proc-macros was introduced to
prevent panicing as they have no AST. Now the new HasSource::source
method is used that returns an option.

Generally this was a pretty trivial change, the only thing of much
interest is that `hir::MacroDef` now implements `TryToNav` not `ToNav`
as this allows us to handle `HasSource::source` now returning an option.
This commit is contained in:
Nick Spain 2021-01-01 14:14:09 +11:00
parent ea4708c444
commit 14d0db0759
4 changed files with 11 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ide/src/display/navigation_target.rs
View file

@ -210,15 +210,7 @@ impl ToNav for FileSymbol {
impl TryToNav for Definition {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
match self {
Definition::Macro(it) => {
// FIXME: Currently proc-macro do not have ast-node,
// such that it does not have source
// more discussion: https://github.com/rust-analyzer/rust-analyzer/issues/6913
if it.is_proc_macro() {
return None;
}
Some(it.to_nav(db))
}
Definition::Macro(it) => it.try_to_nav(db),
Definition::Field(it) => Some(it.to_nav(db)),
Definition::ModuleDef(it) => it.try_to_nav(db),
Definition::SelfType(it) => Some(it.to_nav(db)),
@ -366,10 +358,9 @@ impl ToNav for hir::Field {
}
}
impl ToNav for hir::MacroDef {
fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
#[allow(deprecated)]
let src = self.source_old(db);
impl TryToNav for hir::MacroDef {
fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> {
let src = self.source(db)?;
log::debug!("nav target {:#?}", src.value.syntax());
let mut res = NavigationTarget::from_named(
db,
@ -377,7 +368,7 @@ impl ToNav for hir::MacroDef {
SymbolKind::Macro,
);
res.docs = self.docs(db);
res
Some(res)
}
}