Merge #6927

6927: Do not merge imports with different attributes r=lnicola a=Jesse-Bakker

Fixes #6925 

Co-authored-by: Jesse Bakker <[email protected]>

1 files changed, 14 insertions, 0 deletions

diff --git a/crates/ide_db/src/helpers/insert_use/tests.rs b/crates/ide_db/src/helpers/insert_use/tests.rs
index 9e194354e..a603fe87f 100644
--- a/crates/ide_db/src/helpers/insert_use/tests.rs
+++ b/crates/ide_db/src/helpers/insert_use/tests.rs
@@ -448,6 +448,20 @@ use std::io;",
 }
 
 #[test]
+fn merge_groups_skip_attributed() {
+    check_full(
+        "std::io",
+        r#"
+#[cfg(feature = "gated")] use std::fmt::{Result, Display};
+"#,
+        r#"
+#[cfg(feature = "gated")] use std::fmt::{Result, Display};
+use std::io;
+"#,
+    )
+}
+
+#[test]
 #[ignore] // FIXME: Support this
 fn split_out_merge() {
     check_last(