From 7ccb198af81d8f33ccad66a417ae6529f91df625 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sat, 5 Sep 2020 15:51:26 +0200 Subject: Remove duplicated import merge logic --- crates/assists/src/utils/insert_use.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'crates/assists/src/utils') diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs index 1cb52318a..a920e12c5 100644 --- a/crates/assists/src/utils/insert_use.rs +++ b/crates/assists/src/utils/insert_use.rs @@ -143,8 +143,13 @@ pub(crate) fn try_merge_imports( new: &ast::Use, merge_behaviour: MergeBehaviour, ) -> Option { - // don't merge into re-exports - if old.visibility().and_then(|vis| vis.pub_token()).is_some() { + // don't merge imports with different visibilities + if old + .visibility() + .and_then(|vis| vis.pub_token()) + .or_else(|| new.visibility().and_then(|vis| vis.pub_token())) + .is_some() + { return None; } let old_tree = old.use_tree()?; -- cgit v1.2.3