Merge remote-tracking branch 'rust-analyzer/master'

2 files changed, 15 insertions, 2 deletions

diff --git a/crates/proc_macro_srv/src/tests/mod.rs b/crates/proc_macro_srv/src/tests/mod.rs
index 8e6f28abd..1a827cbd7 100644
--- a/crates/proc_macro_srv/src/tests/mod.rs
+++ b/crates/proc_macro_srv/src/tests/mod.rs
@@ -35,7 +35,7 @@ SUBTREE $
 
 #[test]
 fn test_derive_proc_macro_list() {
-    let res = list("serde_derive", "1.0").join("\n");
+    let res = list("serde_derive", "1").join("\n");
 
     assert_eq_text!(
         &res,
@@ -43,3 +43,16 @@ fn test_derive_proc_macro_list() {
 Deserialize [CustomDerive]"#
     );
 }
+
+/// Tests that we find and classify non-derive macros correctly.
+#[test]
+fn list_test_macros() {
+    let res = list("proc_macro_test", "0.0.0").join("\n");
+
+    assert_eq_text!(
+        &res,
+        r#"function_like_macro [FuncLike]
+attribute_macro [Attr]
+DummyTrait [CustomDerive]"#
+    );
+}
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 5828512d6..36942147d 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
@@ -13,7 +13,7 @@ mod fixtures {
     // Use current project metadata to get the proc-macro dylib path
     pub fn dylib_path(crate_name: &str, version: &str) -> std::path::PathBuf {
         let command = Command::new(toolchain::cargo())
-            .args(&["check", "--message-format", "json"])
+            .args(&["check", "--tests", "--message-format", "json"])
             .output()
             .unwrap()
             .stdout;