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

Return Either from MacroDefId::ast_id

Browse source
This commit is contained in:
Jonas Schievink 2021-03-19 19:56:13 +01:00
parent 0392e63c95
commit 93aeb16eb2
4 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/hir/src/has_source.rs
View file

@ -6,7 +6,7 @@ use hir_def::{
src::{HasChildSource, HasSource as _},
Lookup, VariantId,
};
use hir_expand::{InFile, MacroDefKind};
use hir_expand::InFile;
use syntax::ast;
use crate::{
@ -113,15 +113,10 @@ impl HasSource for TypeAlias {
impl HasSource for MacroDef {
type Ast = Either<ast::Macro, ast::Fn>;
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
Some(match &self.id.kind {
MacroDefKind::Declarative(id)
| MacroDefKind::BuiltIn(_, id)
| MacroDefKind::BuiltInDerive(_, id)
| MacroDefKind::BuiltInEager(_, id) => {
id.with_value(Either::Left(id.to_node(db.upcast())))
}
MacroDefKind::ProcMacro(_, id) => id.map(|_| Either::Right(id.to_node(db.upcast()))),
})
Some(self.id.ast_id().either(
|id| id.with_value(Either::Left(id.to_node(db.upcast()))),
|id| id.with_value(Either::Right(id.to_node(db.upcast()))),
))
}
}
impl HasSource for Impl {