fix SyntacticOrganizeImports

xuwei-k · Jan 13, 2024 · 63dadcb · 63dadcb
1 parent 6e489bd
commit 63dadcb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/...la/fix/SyntacticOrganizeImportsTest.scala → ...a/fix/SyntacticOrganizeImportsTest1.scala b/...la/fix/SyntacticOrganizeImportsTest.scala → ...a/fix/SyntacticOrganizeImportsTest1.scala
@@ -10,4 +10,4 @@ import scala.collection.mutable
 import scala.collection.mutable.SortedMap
 import scala.collection.mutable.SortedSet
 
-class SyntacticOrganizeImports
+class SyntacticOrganizeImportsTest1
diff --git a/input/src/main/scala/fix/SyntacticOrganizeImportsTest2.scala b/input/src/main/scala/fix/SyntacticOrganizeImportsTest2.scala
@@ -0,0 +1,13 @@
+/*
+rule = SyntacticOrganizeImports
+ */
+package fix
+
+import scala.collection.immutable.SortedMap
+import scala.collection.immutable.SortedSet
+import scala.collection.immutable._
+import scala.collection.mutable.SortedMap
+import scala.collection.mutable.SortedSet
+import scala.collection.mutable.*
+
+class SyntacticOrganizeImportsTest2
diff --git a/rules/src/main/scala/fix/SyntacticOrganizeImports.scala b/rules/src/main/scala/fix/SyntacticOrganizeImports.scala
@@ -26,6 +26,22 @@ class SyntacticOrganizeImports extends SyntacticRule("SyntacticOrganizeImports")
     loop(list, Nil).reverse
   }
 
+  private def importToString(i: Import): String = {
+    val s = i.toString
+    if (i.importers.forall(_.importees.forall(!_.is[Importee.Wildcard]))) {
+      s
+    } else {
+      // for consistency OrganizeImports
+      // TODO https://github.com/scalacenter/scalafix/pull/1896 ?
+      val wildcardNewStyle = ".*"
+      if (s.endsWith(wildcardNewStyle)) {
+        s"${s.dropRight(wildcardNewStyle.length)}._"
+      } else {
+        s
+      }
+    }
+  }
+
   override def fix(implicit doc: SyntacticDocument): Patch = {
     doc.tree.collect { case p: Pkg =>
       // find top-level imports
@@ -50,7 +66,7 @@ class SyntacticOrganizeImports extends SyntacticRule("SyntacticOrganizeImports")
               )
           },
           imports
-            .sortBy(_.toString)
+            .sortBy(importToString)
             .zip(imports)
             .find { case (x1, x2) =>
               x1.toString != x2.toString