From 84e13145ff37095a1e73ba1f0fcebb64097087d5 Mon Sep 17 00:00:00 2001
From: davidsemakula <hello@davidsemakula.com>
Date: Mon, 22 Jan 2024 11:18:22 +0300
Subject: [PATCH] add more tests for normalize import assist

---
 .../src/handlers/normalize_import.rs          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/crates/ide-assists/src/handlers/normalize_import.rs b/crates/ide-assists/src/handlers/normalize_import.rs
index 42076c4ff1..7d003efe72 100644
--- a/crates/ide-assists/src/handlers/normalize_import.rs
+++ b/crates/ide-assists/src/handlers/normalize_import.rs
@@ -147,6 +147,59 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_merge_self() {
+        check_assist_variations!("std::{fmt, fmt::Display}", "std::fmt::{self, Display}");
+    }
+
+    #[test]
+    fn test_merge_nested() {
+        check_assist_variations!("std::{fmt::Debug, fmt::Display}", "std::fmt::{Debug, Display}");
+    }
+
+    #[test]
+    fn test_merge_nested2() {
+        check_assist_variations!("std::{fmt::Debug, fmt::Display}", "std::fmt::{Debug, Display}");
+    }
+
+    #[test]
+    fn test_merge_self_with_nested_self_item() {
+        check_assist_variations!(
+            "std::{fmt::{self, Debug}, fmt::{Write, Display}}",
+            "std::fmt::{self, Debug, Display, Write}"
+        );
+    }
+
+    #[test]
+    fn works_with_trailing_comma() {
+        check_assist(
+            normalize_import,
+            r"
+use $0{
+    foo::bar,
+    foo::baz,
+};
+        ",
+            r"
+use foo::{bar, baz};
+        ",
+        );
+        check_assist_import_one(
+            normalize_import,
+            r"
+use $0{
+    foo::bar,
+    foo::baz,
+};
+",
+            r"
+use {
+    foo::{bar, baz},
+};
+",
+        );
+    }
+
     #[test]
     fn not_applicable_to_normalized_import() {
         check_assist_not_applicable_variations!("foo::bar");