Skip to content

fix: Fix fn proc macro input again #8808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2021
Merged

fix: Fix fn proc macro input again #8808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c868414
Revert "Strip delimiter from fn-like proc macro input"
jonas-schievink May 11, 2021
e78221b
Remove delimiters from proc macro input
jonas-schievink May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion crates/hir_expand/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}

Expand Down
31 changes: 2 additions & 29 deletions crates/hir_expand/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
//! Macro input conditioning.

use parser::SyntaxKind;
use syntax::{
ast::{self, AttrsOwner},
AstNode, SyntaxElement, SyntaxNode,
AstNode, SyntaxNode,
};

use crate::{
Expand All @@ -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,
Expand Down