Fix proc_macro::quote! for raw ident

carolynzech · Feb 20, 2025 · 3d9dd4e · 3d9dd4e
1 parent 3b536f1
commit 3d9dd4e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/proc_macro/src/quote.rs b/proc_macro/src/quote.rs
@@ -112,8 +112,14 @@ pub fn quote(stream: TokenStream) -> TokenStream {
                 )), &mut ts);)
             }
             TokenTree::Ident(tt) => {
-                minimal_quote!(crate::ToTokens::to_tokens(&crate::TokenTree::Ident(crate::Ident::new(
-                    (@ TokenTree::from(Literal::string(&tt.to_string()))),
+                let literal = tt.to_string();
+                let (literal, ctor) = if let Some(stripped) = literal.strip_prefix("r#") {
+                    (stripped, minimal_quote!(crate::Ident::new_raw))
+                } else {
+                    (literal.as_str(), minimal_quote!(crate::Ident::new))
+                };
+                minimal_quote!(crate::ToTokens::to_tokens(&crate::TokenTree::Ident((@ ctor)(
+                    (@ TokenTree::from(Literal::string(literal))),
                     (@ quote_span(proc_macro_crate.clone(), tt.span())),
                 )), &mut ts);)
             }