bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/expand_macro.rs')
-rw-r--r--crates/ide/src/expand_macro.rs77
1 files changed, 38 insertions, 39 deletions
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index 7d02b80918..44285d9315 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -63,7 +63,7 @@ pub(crate) fn expand_macro(db: &RootDatabase, position: FilePosition) -> Option<
.take_while(|it| it != &token)
.filter(|it| it.kind() == T![,])
.count();
- let ExpandResult { err, value: expansion } = expansions.get(idx)?.clone();
+ let ExpandResult { err, value: expansion } = expansions.get(idx)?.clone()?;
let expansion_file_id = sema.hir_file_for(&expansion).macro_file()?;
let expansion_span_map = db.expansion_span_map(expansion_file_id);
let mut expansion = format(
@@ -583,26 +583,16 @@ fn main() {
fn macro_expand_derive() {
check(
r#"
-//- proc_macros: identity
-//- minicore: clone, derive
+//- proc_macros: identity, derive_identity
+//- minicore: derive
#[proc_macros::identity]
-#[derive(C$0lone)]
+#[derive(proc_macros::DeriveIde$0ntity)]
struct Foo {}
"#,
expect![[r#"
- Clone
- impl <>core::clone::Clone for Foo< >where {
- fn clone(&self) -> Self {
- match self {
- Foo{}
- => Foo{}
- ,
-
- }
- }
-
- }"#]],
+ proc_macros::DeriveIdentity
+ struct Foo{}"#]],
);
}
@@ -610,15 +600,17 @@ struct Foo {}
fn macro_expand_derive2() {
check(
r#"
-//- minicore: copy, clone, derive
+//- proc_macros: derive_identity
+//- minicore: derive
-#[derive(Cop$0y)]
-#[derive(Clone)]
+#[derive(proc_macros::$0DeriveIdentity)]
+#[derive(proc_macros::DeriveIdentity)]
struct Foo {}
"#,
expect![[r#"
- Copy
- impl <>core::marker::Copy for Foo< >where{}"#]],
+ proc_macros::DeriveIdentity
+ #[derive(proc_macros::DeriveIdentity)]
+ struct Foo{}"#]],
);
}
@@ -626,35 +618,27 @@ struct Foo {}
fn macro_expand_derive_multi() {
check(
r#"
-//- minicore: copy, clone, derive
+//- proc_macros: derive_identity
+//- minicore: derive
-#[derive(Cop$0y, Clone)]
+#[derive(proc_macros::DeriveIdent$0ity, proc_macros::DeriveIdentity)]
struct Foo {}
"#,
expect![[r#"
- Copy
- impl <>core::marker::Copy for Foo< >where{}"#]],
+ proc_macros::DeriveIdentity
+ struct Foo{}"#]],
);
check(
r#"
-//- minicore: copy, clone, derive
+//- proc_macros: derive_identity
+//- minicore: derive
-#[derive(Copy, Cl$0one)]
+#[derive(proc_macros::DeriveIdentity, proc_macros::De$0riveIdentity)]
struct Foo {}
"#,
expect![[r#"
- Clone
- impl <>core::clone::Clone for Foo< >where {
- fn clone(&self) -> Self {
- match self {
- Foo{}
- => Foo{}
- ,
-
- }
- }
-
- }"#]],
+ proc_macros::DeriveIdentity
+ struct Foo{}"#]],
);
}
@@ -864,4 +848,19 @@ struct S {
u32"#]],
);
}
+
+ #[test]
+ fn regression_21489() {
+ check(
+ r#"
+//- proc_macros: derive_identity
+//- minicore: derive, fmt
+#[derive(Debug, proc_macros::DeriveIdentity$0)]
+struct Foo;
+ "#,
+ expect![[r#"
+ proc_macros::DeriveIdentity
+ struct Foo;"#]],
+ );
+ }
}