Skip to content

Commit c868414

Browse files
Revert "Strip delimiter from fn-like proc macro input"
This reverts commit bda68e2.
1 parent c6e2ba4 commit c868414

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

crates/hir_expand/src/input.rs

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//! Macro input conditioning.
22
3-
use parser::SyntaxKind;
43
use syntax::{
54
ast::{self, AttrsOwner},
6-
AstNode, SyntaxElement, SyntaxNode,
5+
AstNode, SyntaxNode,
76
};
87

98
use crate::{
@@ -20,33 +19,7 @@ pub(crate) fn process_macro_input(
2019
let loc: MacroCallLoc = db.lookup_intern_macro(id);
2120

2221
match loc.kind {
23-
MacroCallKind::FnLike { .. } => {
24-
if !loc.def.is_proc_macro() {
25-
// MBE macros expect the parentheses as part of their input.
26-
return node;
27-
}
28-
29-
// The input includes the `(` + `)` delimiter tokens, so remove them before passing this
30-
// to the macro.
31-
let node = node.clone_for_update();
32-
if let Some(SyntaxElement::Token(tkn)) = node.first_child_or_token() {
33-
if matches!(
34-
tkn.kind(),
35-
SyntaxKind::L_BRACK | SyntaxKind::L_PAREN | SyntaxKind::L_CURLY
36-
) {
37-
tkn.detach();
38-
}
39-
}
40-
if let Some(SyntaxElement::Token(tkn)) = node.last_child_or_token() {
41-
if matches!(
42-
tkn.kind(),
43-
SyntaxKind::R_BRACK | SyntaxKind::R_PAREN | SyntaxKind::R_CURLY
44-
) {
45-
tkn.detach();
46-
}
47-
}
48-
node
49-
}
22+
MacroCallKind::FnLike { .. } => node,
5023
MacroCallKind::Derive { derive_attr_index, .. } => {
5124
let item = match ast::Item::cast(node.clone()) {
5225
Some(item) => item,

crates/hir_expand/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,6 @@ impl MacroDefId {
272272
};
273273
Either::Left(*id)
274274
}
275-
276-
pub fn is_proc_macro(&self) -> bool {
277-
matches!(self.kind, MacroDefKind::ProcMacro(..))
278-
}
279275
}
280276

281277
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

0 commit comments

Comments
 (0)