Renames and wildcard should not be separated (#151)

liancheng · Jan 14, 2021 · 574bc20 · 574bc20
1 parent 7e8f5c3
commit 574bc20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/input/src/main/scala/fix/GroupedImportsExplodeMixed.scala b/input/src/main/scala/fix/GroupedImportsExplodeMixed.scala
@@ -7,6 +7,4 @@ package fix
 import scala.collection.immutable._
 import scala.collection.mutable.{Map, Seq => S, Buffer => _, _}
 
-object GroupedImportsExplodeMixed {
-  val m: Map[Int, Int] = ???
-}
+object GroupedImportsExplodeMixed
diff --git a/output/src/main/scala/fix/GroupedImportsExplodeMixed.scala b/output/src/main/scala/fix/GroupedImportsExplodeMixed.scala
@@ -2,9 +2,6 @@ package fix
 
 import scala.collection.immutable._
 import scala.collection.mutable.Map
-import scala.collection.mutable.{Buffer => _, _}
-import scala.collection.mutable.{Seq => S}
+import scala.collection.mutable.{Buffer => _, Seq => S, _}
 
-object GroupedImportsExplodeMixed {
-  val m: Map[Int, Int] = ???
-}
+object GroupedImportsExplodeMixed
diff --git a/rules/src/main/scala/fix/OrganizeImports.scala b/rules/src/main/scala/fix/OrganizeImports.scala
@@ -720,17 +720,16 @@ object OrganizeImports {
         importer :: Nil
 
       case Importer(ref, Importees(names, renames, unimports, Some(wildcard))) =>
-        // When a wildcard exists, all unimports (if any) and the wildcard must appear in the same
+        // When a wildcard exists, all renames, unimports, and the wildcard must appear in the same
         // importer, e.g.:
         //
         //   import p.{A => _, B => _, C => D, E, _}
         //
         // should be rewritten into
         //
-        //   import p.{A => _, B => _, _}
-        //   import p.{C => D}
+        //   import p.{A => _, B => _, C => D, _}
         //   import p.E
-        val importeesList = (names ++ renames).map(_ :: Nil) :+ (unimports :+ wildcard)
+        val importeesList = names.map(_ :: Nil) :+ (renames ++ unimports :+ wildcard)
         importeesList filter (_.nonEmpty) map (Importer(ref, _))
 
       case importer =>