Downmap the token in attribute inputs when expanding speculatively

crates/base_db/src/fixture.rs

@@ -258,12 +258,23 @@ fn test_proc_macros(proc_macros: &[String]) -> (Vec<ProcMacro>, String) {
 pub fn identity(_attr: TokenStream, item: TokenStream) -> TokenStream {
     item
 }
+#[proc_macro_attribute]
+pub fn input_replace(attr: TokenStream, _item: TokenStream) -> TokenStream {
+    attr
+}
 "#;
-    let proc_macros = std::array::IntoIter::new([ProcMacro {
+    let proc_macros = std::array::IntoIter::new([
-        name: "identity".into(),
+        ProcMacro {
-        kind: crate::ProcMacroKind::Attr,
+            name: "identity".into(),
-        expander: Arc::new(IdentityProcMacroExpander),
+            kind: crate::ProcMacroKind::Attr,
-    }])
+            expander: Arc::new(IdentityProcMacroExpander),
+        },
+        ProcMacro {
+            name: "input_replace".into(),
+            kind: crate::ProcMacroKind::Attr,
+            expander: Arc::new(AttributeInputReplaceProcMacroExpander),
+        },
+    ])
     .filter(|pm| proc_macros.iter().any(|name| name == &pm.name))
     .collect();
     (proc_macros, source.into())
@@ -308,8 +319,9 @@ impl From<Fixture> for FileMeta {
     }
 }
 
+// Identity mapping
 #[derive(Debug)]
-pub struct IdentityProcMacroExpander;
+struct IdentityProcMacroExpander;
 impl ProcMacroExpander for IdentityProcMacroExpander {
     fn expand(
         &self,
@@ -320,3 +332,19 @@ impl ProcMacroExpander for IdentityProcMacroExpander {
         Ok(subtree.clone())
     }
 }
+
+// Pastes the attribute input as its output
+#[derive(Debug)]
+struct AttributeInputReplaceProcMacroExpander;
+impl ProcMacroExpander for AttributeInputReplaceProcMacroExpander {
+    fn expand(
+        &self,
+        _: &Subtree,
+        attrs: Option<&Subtree>,
+        _: &Env,
+    ) -> Result<Subtree, ProcMacroExpansionError> {
+        attrs
+            .cloned()
+            .ok_or_else(|| ProcMacroExpansionError::Panic("Expected attribute input".into()))
+    }
+}

crates/hir_expand/src/db.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use base_db::{salsa, SourceDatabase};
 use itertools::Itertools;
 use limit::Limit;
-use mbe::{ExpandError, ExpandResult};
+use mbe::{syntax_node_to_token_tree, ExpandError, ExpandResult};
 use syntax::{
     algo::diff,
     ast::{self, AttrsOwner, NameOwner},
@@ -146,24 +146,57 @@ pub fn expand_speculative(
 ) -> Option<(SyntaxNode, SyntaxToken)> {
     let loc = db.lookup_intern_macro(actual_macro_call);
     let macro_def = db.macro_def(loc.def)?;
+    let token_range = token_to_map.text_range();
 
-    // Fetch token id in the speculative args
+    // Build the subtree and token mapping for the speculative args
     let censor = censor_for_macro_input(&loc, &speculative_args);
-    let (tt, args_tmap) = mbe::syntax_node_to_token_tree_censored(&speculative_args, censor);
+    let (mut tt, spec_args_tmap) =
-    let range = token_to_map.text_range().checked_sub(speculative_args.text_range().start())?;
+        mbe::syntax_node_to_token_tree_censored(&speculative_args, censor);
-    let token_id = args_tmap.token_by_range(range)?;
 
-    let speculative_expansion = if let MacroDefKind::ProcMacro(expander, ..) = loc.def.kind {
+    let (attr_arg, token_id) = match loc.kind {
-        let attr_arg = match &loc.kind {
+        MacroCallKind::Attr { invoc_attr_index, .. } => {
-            // FIXME make attr arg speculative as well
+            // Attributes may have an input token tree, build the subtree and map for this as well
-            MacroCallKind::Attr { attr_args, .. } => {
+            // then try finding a token id for our token if it is inside this input subtree.
-                let mut attr_args = attr_args.0.clone();
+            let item = ast::Item::cast(speculative_args.clone())?;
-                mbe::Shift::new(&tt).shift_all(&mut attr_args);
+            let attr = item.attrs().nth(invoc_attr_index as usize)?;
-                Some(attr_args)
+            match attr.token_tree() {
+                Some(token_tree) => {
+                    let (mut tree, map) = syntax_node_to_token_tree(attr.token_tree()?.syntax());
+                    tree.delimiter = None;
+
+                    let shift = mbe::Shift::new(&tt);
+                    shift.shift_all(&mut tree);
+
+                    let token_id = if token_tree.syntax().text_range().contains_range(token_range) {
+                        let attr_input_start =
+                            token_tree.left_delimiter_token()?.text_range().start();
+                        let range = token_range.checked_sub(attr_input_start)?;
+                        let token_id = shift.shift(map.token_by_range(range)?);
+                        Some(token_id)
+                    } else {
+                        None
+                    };
+                    (Some(tree), token_id)
+                }
+                _ => (None, None),
             }
-            _ => None,
+        }
-        };
+        _ => (None, None),
+    };
+    let token_id = match token_id {
+        Some(token_id) => token_id,
+        // token wasn't inside an attribute input so it has to be in the general macro input
+        None => {
+            let range = token_range.checked_sub(speculative_args.text_range().start())?;
+            let token_id = spec_args_tmap.token_by_range(range)?;
+            macro_def.map_id_down(token_id)
+        }
+    };
 
+    // Do the actual expansion, we need to directly expand the proc macro due to the attribute args
+    // Otherwise the expand query will fetch the non speculative attribute args and pass those instead.
+    let speculative_expansion = if let MacroDefKind::ProcMacro(expander, ..) = loc.def.kind {
+        tt.delimiter = None;
         expander.expand(db, loc.krate, &tt, attr_arg.as_ref())
     } else {
         macro_def.expand(db, actual_macro_call, &tt)
@@ -173,7 +206,6 @@ pub fn expand_speculative(
     let (node, rev_tmap) =
         token_tree_to_syntax_node(&speculative_expansion.value, expand_to).ok()?;
 
-    let token_id = macro_def.map_id_down(token_id);
     let range = rev_tmap.first_range_by_token(token_id, token_to_map.kind())?;
     let token = node.syntax_node().covering_element(range).into_token()?;
     Some((node.syntax_node(), token))

crates/ide_completion/src/context.rs

@@ -183,6 +183,7 @@ impl<'a> CompletionContext<'a> {
         );
         Some(ctx)
     }
+
     fn expand_and_fill(
         &mut self,
         mut original_file: SyntaxNode,
@@ -191,6 +192,7 @@ impl<'a> CompletionContext<'a> {
         mut fake_ident_token: SyntaxToken,
     ) {
         loop {
+            // Expand attributes
             if let (Some(actual_item), Some(item_with_fake_ident)) = (
                 find_node_at_offset::<ast::Item>(&original_file, offset),
                 find_node_at_offset::<ast::Item>(&speculative_file, offset),
@@ -219,6 +221,7 @@ impl<'a> CompletionContext<'a> {
                 }
             }
 
+            // Expand fn-like macro calls
             if let (Some(actual_macro_call), Some(macro_call_with_fake_ident)) = (
                 find_node_at_offset::<ast::MacroCall>(&original_file, offset),
                 find_node_at_offset::<ast::MacroCall>(&speculative_file, offset),

crates/ide_completion/src/tests/proc_macros.rs

@@ -73,3 +73,73 @@ fn main() {
         "#]],
     )
 }
+
+#[test]
+fn complete_dot_in_attr_input() {
+    check(
+        r#"
+//- proc_macros: input_replace
+pub struct Foo;
+impl Foo {
+    fn foo(&self) {}
+}
+
+#[proc_macros::input_replace(
+    fn suprise() {
+        Foo.$0
+    }
+)]
+fn main() {}
+"#,
+        expect![[r#"
+            me foo() fn(&self)
+            sn ref   &expr
+            sn refm  &mut expr
+            sn match match expr {}
+            sn box   Box::new(expr)
+            sn ok    Ok(expr)
+            sn err   Err(expr)
+            sn some  Some(expr)
+            sn dbg   dbg!(expr)
+            sn dbgr  dbg!(&expr)
+            sn call  function(expr)
+            sn let   let
+            sn letm  let mut
+        "#]],
+    )
+}
+
+#[test]
+fn complete_dot_in_attr_input2() {
+    check(
+        r#"
+//- proc_macros: input_replace
+pub struct Foo;
+impl Foo {
+    fn foo(&self) {}
+}
+
+#[proc_macros::input_replace(
+    fn suprise() {
+        Foo.f$0
+    }
+)]
+fn main() {}
+"#,
+        expect![[r#"
+            me foo() fn(&self)
+            sn ref   &expr
+            sn refm  &mut expr
+            sn match match expr {}
+            sn box   Box::new(expr)
+            sn ok    Ok(expr)
+            sn err   Err(expr)
+            sn some  Some(expr)
+            sn dbg   dbg!(expr)
+            sn dbgr  dbg!(&expr)
+            sn call  function(expr)
+            sn let   let
+            sn letm  let mut
+        "#]],
+    )
+}