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_def/src/path/lower.rs | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
(limited to 'crates/ra_hir_def/src/path')
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index 9ec2e0dcd..e632f1afb 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -9,7 +9,10 @@ use hir_expand::{
hygiene::Hygiene,
name::{name, AsName},
};
-use ra_syntax::ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner};
+use ra_syntax::{
+ ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner},
+ T,
+};
use super::AssociatedTypeBinding;
use crate::{
@@ -113,6 +116,20 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
}
segments.reverse();
generic_args.reverse();
+
+ // handle local_inner_macros :
+ // Basically, even in rustc it is quite hacky:
+ // https://github.com/rust-lang/rust/blob/614f273e9388ddd7804d5cbc80b8865068a3744e/src/librustc_resolve/macros.rs#L456
+ // We follow what it did anyway :)
+ if segments.len() == 1 && kind == PathKind::Plain {
+ let next = path.syntax().last_token().and_then(|it| it.next_token());
+ if next.map_or(false, |it| it.kind() == T![!]) {
+ if let Some(crate_id) = hygiene.local_inner_macros() {
+ kind = PathKind::DollarCrate(crate_id);
+ }
+ }
+ }
+
let mod_path = ModPath { kind, segments };
return Some(Path { type_anchor, mod_path, generic_args });
--
cgit v1.2.3
From edf0b4c1528407d5077220191e601ac41f790b99 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sat, 2 May 2020 10:16:26 +0800
Subject: Test whether it is bang macro properly
---
crates/ra_hir_def/src/path/lower.rs | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
(limited to 'crates/ra_hir_def/src/path')
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index e632f1afb..b902cacd1 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -9,10 +9,7 @@ use hir_expand::{
hygiene::Hygiene,
name::{name, AsName},
};
-use ra_syntax::{
- ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner},
- T,
-};
+use ra_syntax::ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner};
use super::AssociatedTypeBinding;
use crate::{
@@ -122,10 +119,11 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
// https://github.com/rust-lang/rust/blob/614f273e9388ddd7804d5cbc80b8865068a3744e/src/librustc_resolve/macros.rs#L456
// We follow what it did anyway :)
if segments.len() == 1 && kind == PathKind::Plain {
- let next = path.syntax().last_token().and_then(|it| it.next_token());
- if next.map_or(false, |it| it.kind() == T![!]) {
- if let Some(crate_id) = hygiene.local_inner_macros() {
- kind = PathKind::DollarCrate(crate_id);
+ if let Some(macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) {
+ if macro_call.is_bang() {
+ if let Some(crate_id) = hygiene.local_inner_macros() {
+ kind = PathKind::DollarCrate(crate_id);
+ }
}
}
}
--
cgit v1.2.3