censor attribute derive

Author: wyatt-herkamp

crates/hir-expand/src/db.rs

@@ -7,6 +7,7 @@ use mbe::{syntax_node_to_token_tree, ValueResult};
 use rustc_hash::FxHashSet;
 use span::{AstIdMap, SyntaxContextData, SyntaxContextId};
 use syntax::{ast, AstNode, Parse, SyntaxElement, SyntaxError, SyntaxNode, SyntaxToken, T};
+use tracing::debug;
 use triomphe::Arc;
 
 use crate::{
@@ -345,7 +346,13 @@ fn smart_macro_arg(db: &dyn ExpandDatabase, id: MacroCallId) -> MacroArgResult {
     // FIXME: We called lookup_intern_macro_call twice.
     match loc.kind {
         // Get the macro arg for the derive macro
-        MacroCallKind::Derive { derive_macro_id, .. } => db.macro_arg(derive_macro_id),
+        MacroCallKind::Derive { derive_macro_id, .. } => {
+            debug!(
+                ?loc,
+                "{id:?} is a derive macro. Using the derive macro, id: {derive_macro_id:?}, attribute as the macro arg."
+            );
+            db.macro_arg(derive_macro_id)
+        }
         // Normal macro arg
         _ => db.macro_arg(id),
     }
@@ -455,7 +462,12 @@ fn macro_arg(
         }
         MacroCallKind::Attr { ast_id, invoc_attr_index, .. } => {
             let node = ast_id.to_ptr(db).to_node(&root);
-            (censor_attr_input(invoc_attr_index, &node), node)
+            if loc.def.is_attribute_derive() && ast::Adt::can_cast(node.syntax().kind()) {
+                let node = ast::Adt::cast(node.syntax().clone()).unwrap();
+                (censor_derive_input(invoc_attr_index, &node), node.into())
+            } else {
+                (censor_attr_input(invoc_attr_index, &node), node)
+            }
         }
     };