From 86c1251afb1476137ce81b86bf1fa229eecdb5fc Mon Sep 17 00:00:00 2001
From: DropDemBits <r3usrlnd@gmail.com>
Date: Mon, 14 Feb 2022 19:41:49 -0500
Subject: [PATCH] fix: Don't drop glob with nested self

---
 crates/ide_assists/src/handlers/merge_imports.rs | 12 ++++++++++++
 crates/ide_db/src/helpers/merge_imports.rs       |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/crates/ide_assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs
index cf30897ab42..2ded8c98037 100644
--- a/crates/ide_assists/src/handlers/merge_imports.rs
+++ b/crates/ide_assists/src/handlers/merge_imports.rs
@@ -321,6 +321,18 @@ use foo::{bar::{self}};
         )
     }
 
+    #[test]
+    fn test_merge_nested_list_self_and_glob() {
+        check_assist(
+            merge_imports,
+            r"
+use std$0::{fmt::*};
+use std::{fmt::{self, Display}};
+",
+            r"use std::{fmt::{self, *, Display}};",
+        )
+    }
+
     #[test]
     fn test_merge_single_wildcard_diff_prefixes() {
         check_assist(
diff --git a/crates/ide_db/src/helpers/merge_imports.rs b/crates/ide_db/src/helpers/merge_imports.rs
index 614784b4674..f113dccdea9 100644
--- a/crates/ide_db/src/helpers/merge_imports.rs
+++ b/crates/ide_db/src/helpers/merge_imports.rs
@@ -115,6 +115,9 @@ fn recursive_merge(lhs: &ast::UseTree, rhs: &ast::UseTree, merge: MergeBehavior)
                     let tree_contains_self = |tree: &ast::UseTree| {
                         tree.use_tree_list()
                             .map(|tree_list| tree_list.use_trees().any(|it| tree_is_self(&it)))
+                            // Glob imports aren't part of the use-tree lists,
+                            // so they need to be handled explicitly
+                            .or_else(|| tree.star_token().is_some().then(|| false))
                     };
                     match (tree_contains_self(lhs_t), tree_contains_self(&rhs_t)) {
                         (Some(true), None) => continue,