From e4267967a8ee3b35d902931cecf06bb4e19f86c5 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Fri, 1 May 2020 11:23:03 +0800
Subject: Support local_inner_macros
---
crates/ra_hir_expand/src/builtin_derive.rs | 2 +-
crates/ra_hir_expand/src/builtin_macro.rs | 4 ++++
crates/ra_hir_expand/src/hygiene.rs | 31 ++++++++++++++++++++----------
crates/ra_hir_expand/src/lib.rs | 2 ++
4 files changed, 28 insertions(+), 11 deletions(-)
(limited to 'crates/ra_hir_expand/src')
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index e60f879a3..25bb5cee3 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -38,7 +38,7 @@ macro_rules! register_builtin {
_ => return None,
};
- Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind) })
+ Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind),local_inner:false })
}
};
}
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index e0fef613d..d8b3d342c 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -73,11 +73,13 @@ pub fn find_builtin_macro(
krate: Some(krate),
ast_id: Some(ast_id),
kind: MacroDefKind::BuiltIn(kind),
+ local_inner: false,
}),
Either::Right(kind) => Some(MacroDefId {
krate: Some(krate),
ast_id: Some(ast_id),
kind: MacroDefKind::BuiltInEager(kind),
+ local_inner: false,
}),
}
}
@@ -406,6 +408,7 @@ mod tests {
krate: Some(CrateId(0)),
ast_id: Some(AstId::new(file_id.into(), ast_id_map.ast_id(¯o_calls[0]))),
kind: MacroDefKind::BuiltIn(expander),
+ local_inner: false,
};
let loc = MacroCallLoc {
@@ -425,6 +428,7 @@ mod tests {
krate: Some(CrateId(0)),
ast_id: Some(AstId::new(file_id.into(), ast_id_map.ast_id(¯o_calls[0]))),
kind: MacroDefKind::BuiltInEager(expander),
+ local_inner: false,
};
let args = macro_calls[1].token_tree().unwrap();
diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/ra_hir_expand/src/hygiene.rs
index 0b41d0e95..3da93de21 100644
--- a/crates/ra_hir_expand/src/hygiene.rs
+++ b/crates/ra_hir_expand/src/hygiene.rs
@@ -16,31 +16,34 @@ use crate::{
pub struct Hygiene {
// This is what `$crate` expands to
def_crate: Option<CrateId>,
+
+ // Indiciate this is a local inner macro
+ local_inner: bool,
}
impl Hygiene {
pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Hygiene {
- let def_crate = match file_id.0 {
- HirFileIdRepr::FileId(_) => None,
+ let (def_crate, local_inner) = match file_id.0 {
+ HirFileIdRepr::FileId(_) => (None, false),
HirFileIdRepr::MacroFile(macro_file) => match macro_file.macro_call_id {
MacroCallId::LazyMacro(id) => {
let loc = db.lookup_intern_macro(id);
match loc.def.kind {
- MacroDefKind::Declarative => loc.def.krate,
- MacroDefKind::BuiltIn(_) => None,
- MacroDefKind::BuiltInDerive(_) => None,
- MacroDefKind::BuiltInEager(_) => None,
- MacroDefKind::CustomDerive(_) => None,
+ MacroDefKind::Declarative => (loc.def.krate, loc.def.local_inner),
+ MacroDefKind::BuiltIn(_) => (None, false),
+ MacroDefKind::BuiltInDerive(_) => (None, false),
+ MacroDefKind::BuiltInEager(_) => (None, false),
+ MacroDefKind::CustomDerive(_) => (None, false),
}
}
- MacroCallId::EagerMacro(_id) => None,
+ MacroCallId::EagerMacro(_id) => (None, false),
},
};
- Hygiene { def_crate }
+ Hygiene { def_crate, local_inner }
}
pub fn new_unhygienic() -> Hygiene {
- Hygiene { def_crate: None }
+ Hygiene { def_crate: None, local_inner: false }
}
// FIXME: this should just return name
@@ -52,4 +55,12 @@ impl Hygiene {
}
Either::Left(name_ref.as_name())
}
+
+ pub fn local_inner_macros(&self) -> Option<CrateId> {
+ if self.local_inner {
+ self.def_crate
+ } else {
+ None
+ }
+ }
}
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 754a0f005..f440c073b 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -204,6 +204,8 @@ pub struct MacroDefId {
pub krate: Option<CrateId>,
pub ast_id: Option<AstId<ast::MacroCall>>,
pub kind: MacroDefKind,
+
+ pub local_inner: bool,
}
impl MacroDefId {
--
cgit v1.2.3
From 443762cda914e56487e51ed0e104b3aac7285b1a Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sat, 2 May 2020 09:56:38 +0800
Subject: Update crates/ra_hir_expand/src/builtin_derive.rs
Fix spacing
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
---
crates/ra_hir_expand/src/builtin_derive.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'crates/ra_hir_expand/src')
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index 25bb5cee3..1dc9cac66 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -38,7 +38,7 @@ macro_rules! register_builtin {
_ => return None,
};
- Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind),local_inner:false })
+ Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind), local_inner: false })
}
};
}
--
cgit v1.2.3