From c868414dcd50bbfe433cc93f8319d41e6742542c Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 12 May 2021 00:57:41 +0200
Subject: Revert "Strip delimiter from fn-like proc macro input"

This reverts commit bda68e23328ca62a71da348a13c4d13cc8f991f3.
---
 crates/hir_expand/src/input.rs | 31 ++-----------------------------
 crates/hir_expand/src/lib.rs   |  4 ----
 2 files changed, 2 insertions(+), 33 deletions(-)

(limited to 'crates/hir_expand')

diff --git a/crates/hir_expand/src/input.rs b/crates/hir_expand/src/input.rs
index 860aa049b..112216859 100644
--- a/crates/hir_expand/src/input.rs
+++ b/crates/hir_expand/src/input.rs
@@ -1,9 +1,8 @@
 //! Macro input conditioning.
 
-use parser::SyntaxKind;
 use syntax::{
     ast::{self, AttrsOwner},
-    AstNode, SyntaxElement, SyntaxNode,
+    AstNode, SyntaxNode,
 };
 
 use crate::{
@@ -20,33 +19,7 @@ pub(crate) fn process_macro_input(
     let loc: MacroCallLoc = db.lookup_intern_macro(id);
 
     match loc.kind {
-        MacroCallKind::FnLike { .. } => {
-            if !loc.def.is_proc_macro() {
-                // MBE macros expect the parentheses as part of their input.
-                return node;
-            }
-
-            // The input includes the `(` + `)` delimiter tokens, so remove them before passing this
-            // to the macro.
-            let node = node.clone_for_update();
-            if let Some(SyntaxElement::Token(tkn)) = node.first_child_or_token() {
-                if matches!(
-                    tkn.kind(),
-                    SyntaxKind::L_BRACK | SyntaxKind::L_PAREN | SyntaxKind::L_CURLY
-                ) {
-                    tkn.detach();
-                }
-            }
-            if let Some(SyntaxElement::Token(tkn)) = node.last_child_or_token() {
-                if matches!(
-                    tkn.kind(),
-                    SyntaxKind::R_BRACK | SyntaxKind::R_PAREN | SyntaxKind::R_CURLY
-                ) {
-                    tkn.detach();
-                }
-            }
-            node
-        }
+        MacroCallKind::FnLike { .. } => node,
         MacroCallKind::Derive { derive_attr_index, .. } => {
             let item = match ast::Item::cast(node.clone()) {
                 Some(item) => item,
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index 88cb16ca4..5df11856e 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -272,10 +272,6 @@ impl MacroDefId {
         };
         Either::Left(*id)
     }
-
-    pub fn is_proc_macro(&self) -> bool {
-        matches!(self.kind, MacroDefKind::ProcMacro(..))
-    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-- 
cgit v1.2.3


From e78221bc58a050e8651f5be591561e7adf89c371 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 12 May 2021 01:01:51 +0200
Subject: Remove delimiters from proc macro input

---
 crates/hir_expand/src/db.rs  | 11 ++++++++++-
 crates/hir_expand/src/lib.rs |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'crates/hir_expand')

diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index 9fa419fcf..c43d382ad 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -267,7 +267,16 @@ fn parse_macro_expansion(
 
 fn macro_arg(db: &dyn AstDatabase, id: MacroCallId) -> Option<Arc<(tt::Subtree, mbe::TokenMap)>> {
     let arg = db.macro_arg_text(id)?;
-    let (tt, tmap) = mbe::syntax_node_to_token_tree(&SyntaxNode::new_root(arg));
+    let (mut tt, tmap) = mbe::syntax_node_to_token_tree(&SyntaxNode::new_root(arg));
+
+    if let MacroCallId::LazyMacro(id) = id {
+        let loc: MacroCallLoc = db.lookup_intern_macro(id);
+        if loc.def.is_proc_macro() {
+            // proc macros expect their inputs without parentheses, MBEs expect it with them included
+            tt.delimiter = None;
+        }
+    }
+
     Some(Arc::new((tt, tmap)))
 }
 
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index 5df11856e..88cb16ca4 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -272,6 +272,10 @@ impl MacroDefId {
         };
         Either::Left(*id)
     }
+
+    pub fn is_proc_macro(&self) -> bool {
+        matches!(self.kind, MacroDefKind::ProcMacro(..))
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-- 
cgit v1.2.3