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

Move hir to new MacroId

Browse source
This commit is contained in:
Lukas Wirth 2022-03-08 23:51:48 +01:00
parent ad54ee2939
commit c04b0f435b
8 changed files with 211 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,13 +4,13 @@ use either::Either;
use hir_def::{
nameres::{ModuleOrigin, ModuleSource},
src::{HasChildSource, HasSource as _},
Lookup, VariantId,
Lookup, MacroId, VariantId,
};
use hir_expand::InFile;
use syntax::ast;
use crate::{
db::HirDatabase, Adt, Const, Enum, Field, FieldSource, Function, Impl, LifetimeParam, MacroDef,
db::HirDatabase, Adt, Const, Enum, Field, FieldSource, Function, Impl, LifetimeParam, Macro,
Module, Static, Struct, Trait, TypeAlias, TypeOrConstParam, Union, Variant,
};
@ -123,13 +123,26 @@ impl HasSource for TypeAlias {
Some(self.id.lookup(db.upcast()).source(db.upcast()))
}
}
impl HasSource for MacroDef {
impl HasSource for Macro {
type Ast = Either<ast::Macro, ast::Fn>;
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
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()))),
))
match self.id {
MacroId::Macro2Id(it) => Some(
it.lookup(db.upcast())
.source(db.upcast())
.map(ast::Macro::MacroDef)
.map(Either::Left),
),
MacroId::MacroRulesId(it) => Some(
it.lookup(db.upcast())
.source(db.upcast())
.map(ast::Macro::MacroRules)
.map(Either::Left),
),
MacroId::ProcMacroId(it) => {
Some(it.lookup(db.upcast()).source(db.upcast()).map(Either::Right))
}
}
}
}
impl HasSource for Impl {