OrganizeImports: support Scala3 syntax

scalafix-rules/src/main/scala/scalafix/internal/rule/OrganizeImports.scala

@@ -572,7 +572,12 @@ class OrganizeImports(
 
       importer match {
         case Importer(_, Importee.Wildcard() :: Nil) =>
-          syntax.patch(syntax.lastIndexOfSlice("._"), ".\u0001", 2)
+          val wildcardSyntax = Importee.Wildcard().syntax
+          syntax.patch(
+            syntax.lastIndexOfSlice(s".$wildcardSyntax"),
+            ".\u0001",
+            2
+          )
 
         case _ if importer.isCurlyBraced =>
           syntax
@@ -714,9 +719,48 @@ class OrganizeImports(
   private def importerSyntax(importer: Importer): String =
     importer.pos match {
       case pos: Position.Range =>
-        // Position found, implies that `importer` was directly parsed from the source code. Returns
-        // the original parsed text to preserve the original source level formatting.
-        pos.text
+        // Position found, implies that `importer` was directly parsed from the source code. Use
+        // the original parsed text to preserve the original source level formatting, but patch
+        // importee that have specific Scala 3 syntax.
+        val syntax = new StringBuilder(pos.text)
+        def patchSyntax(
+            t: Tree,
+            newSyntax: String,
+            stripEnclosingBraces: Boolean = false
+        ) = {
+          val start = t.pos.start - pos.start
+          syntax.replace(start, t.pos.end - pos.start, newSyntax)
+          val end = t.pos.start - pos.start + newSyntax.length
+
+          if (stripEnclosingBraces)
+            (
+              syntax.take(start).lastIndexOf('{'),
+              syntax.indexOf('}', end)
+            ) match {
+              case (from, to) if from != -1 && to != -1 =>
+                syntax.delete(end, to + 1)
+                syntax.delete(from, start)
+              case _ =>
+            }
+        }
+        val Importer(_, importees) = importer
+        val optionalBraces =
+          importees.length == 1 && targetDialect.allowAsForImportRename
+        // traverse & patch backwards to avoid shifting indices
+        importees.reverse.foreach {
+          case i @ Importee.Rename(_, _) =>
+            patchSyntax(i, i.copy().syntax, optionalBraces)
+          case i @ Importee.Unimport(_) =>
+            patchSyntax(i, i.copy().syntax, optionalBraces)
+          case i @ Importee.Wildcard() =>
+            patchSyntax(i, i.copy().syntax)
+          case i @ Importee.GivenAll() =>
+            patchSyntax(i, i.copy().syntax, importees.length == 1)
+          case i @ Importee.Given(_) =>
+            patchSyntax(i, i.copy().syntax, importees.length == 1)
+          case _ =>
+        }
+        syntax.toString
 
       case Position.None =>
         // Position not found, implies that `importer` is derived from certain existing import
@@ -742,7 +786,9 @@ class OrganizeImports(
     def isCurlyBraced: Boolean = {
       val importees @ Importees(_, renames, unimports, _, _, _) =
         importer.importees
-      renames.nonEmpty || unimports.nonEmpty || importees.length > 1
+
+      importees.length > 1 ||
+      ((renames.length == 1 || unimports.length == 1) && !targetDialect.allowAsForImportRename)
     }
 
     /**

scalafix-tests/input/src/main/scala-3/test/organizeImports/ExpandGiven.scala

@@ -7,6 +7,8 @@ package test.organizeImports
 import test.organizeImports.GivenImports.Beta
 import test.organizeImports.GivenImports.Alpha
 import test.organizeImports.GivenImports.{given Beta, given Alpha}
+import test.organizeImports.GivenImports2.{given Beta}
+import test.organizeImports.GivenImports2.{given}
 import scala.util.Either
 
 object ExpandGiven

scalafix-tests/input/src/main/scala-3/test/organizeImports/GroupedGivenImportsMergeUnimports.scala

@@ -5,14 +5,14 @@ OrganizeImports.groupedImports = Merge
  */
 package test.organizeImports
 
-import test.organizeImports.GivenImports._
-import test.organizeImports.GivenImports.{alpha => _, given}
+import test.organizeImports.GivenImports.*
+import test.organizeImports.GivenImports.{alpha as _, given}
 import test.organizeImports.GivenImports.{given Beta}
-import test.organizeImports.GivenImports.{gamma => _, given}
+import test.organizeImports.GivenImports.{gamma as _, given}
 import test.organizeImports.GivenImports.{given Zeta}
 
-import test.organizeImports.GivenImports2.{alpha => _}
-import test.organizeImports.GivenImports2.{beta => _}
+import test.organizeImports.GivenImports2.{alpha as _}
+import test.organizeImports.GivenImports2.beta as _
 import test.organizeImports.GivenImports2.{given Gamma}
 import test.organizeImports.GivenImports2.{given Zeta}
 

scalafix-tests/input/src/main/scala/test/organizeImports/CurlyBracedSingleImportee.scala

@@ -5,6 +5,7 @@ OrganizeImports.removeUnused = false
 package test.organizeImports
 
 import scala.collection.{Map}
+import scala.collection.{Seq => _}
 import scala.collection.{Set => ImmutableSet}
 
 object CurlyBracedSingleImportee

scalafix-tests/input/src/main/scala/test/organizeImports/ExplodeImportsFormatPreserving.scala

@@ -7,6 +7,6 @@ OrganizeImports.groupedImports = Explode
 package test.organizeImports
 
 import test.organizeImports.ExplodeImports.FormatPreserving.g1.{ a, b }
-import test.organizeImports.ExplodeImports.FormatPreserving.g2.{ c => C, _ }
+import test.organizeImports.ExplodeImports.FormatPreserving.g2.{ c  =>  C, _ }
 
 object ExplodeImportsFormatPreserving

scalafix-tests/input/src/main/scala/test/organizeImports/ImportsOrderSymbolsFirst.scala

@@ -15,6 +15,9 @@ import scala.concurrent.duration
 import scala.concurrent.{Promise, Future}
 
 import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.e
+import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.{  e => E  }
+import test.organizeImports.QuotedIdent.`a.b`
+import test.organizeImports.QuotedIdent.{`a.b` => ab}
 import test.organizeImports.QuotedIdent.`a.b`.{c => _, _}
 import test.organizeImports.QuotedIdent._
 

scalafix-tests/output/src/main/scala/test/organizeImports/CurlyBracedSingleImportee.scala → scalafix-tests/output/src/main/scala-2/test/organizeImports/CurlyBracedSingleImportee.scala

@@ -1,6 +1,7 @@
 package test.organizeImports
 
 import scala.collection.Map
+import scala.collection.{Seq => _}
 import scala.collection.{Set => ImmutableSet}
 
 object CurlyBracedSingleImportee

scalafix-tests/output/src/main/scala/test/organizeImports/ImportsOrderSymbolsFirst.scala → scalafix-tests/output/src/main/scala-2/test/organizeImports/ImportsOrderSymbolsFirst.scala

@@ -1,7 +1,10 @@
 package test.organizeImports
 
 import test.organizeImports.QuotedIdent._
+import test.organizeImports.QuotedIdent.{`a.b` => ab}
+import test.organizeImports.QuotedIdent.`a.b`
 import test.organizeImports.QuotedIdent.`a.b`.{c => _, _}
+import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.{  e => E  }
 import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.e
 
 import scala.concurrent._

scalafix-tests/output/src/main/scala-3/test/organizeImports/CoalesceImportees.scala

@@ -0,0 +1,8 @@
+package test.organizeImports
+
+import scala.collection.immutable.{Map, Seq, Vector}
+import scala.collection.mutable.*
+import scala.concurrent.{Channel as Ch, *}
+import scala.util.{Random as _, *}
+
+object CoalesceImportees

scalafix-tests/output/src/main/scala-3/test/organizeImports/CoalesceImporteesGivensAndNames.scala

@@ -1,6 +1,6 @@
 package test.organizeImports
 
-import test.organizeImports.Givens._
-import test.organizeImports.Givens.{B => B1, C => _, _, given}
+import test.organizeImports.Givens.*
+import test.organizeImports.Givens.{B as B1, C as _, *, given}
 
 object CoalesceImporteesGivensAndNames

scalafix-tests/output/src/main/scala-3/test/organizeImports/CoalesceImporteesNoGivens.scala

@@ -1,5 +1,5 @@
 package test.organizeImports
 
-import test.organizeImports.Givens.{C => C1, _}
+import test.organizeImports.Givens.{C as C1, *}
 
 object CoalesceImporteesNoGivens

scalafix-tests/output/src/main/scala-3/test/organizeImports/CoalesceImporteesNoGivensNoNames.scala

@@ -1,5 +1,5 @@
 package test.organizeImports
 
-import test.organizeImports.Givens.{A => A1, B => _, _}
+import test.organizeImports.Givens.{A as A1, B as _, *}
 
 object CoalesceImporteesNoGivensNoNames

scalafix-tests/output/src/main/scala-3/test/organizeImports/CoalesceImporteesNoNames.scala

@@ -1,6 +1,6 @@
 package test.organizeImports
 
-import test.organizeImports.Givens._
-import test.organizeImports.Givens.{A => A1, given}
+import test.organizeImports.Givens.*
+import test.organizeImports.Givens.{A as A1, given}
 
 object CoalesceImporteesNoNames

scalafix-tests/output/src/main/scala-3/test/organizeImports/CurlyBracedSingleImportee.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import scala.collection.Map
+import scala.collection.Seq as _
+import scala.collection.Set as ImmutableSet
+
+object CurlyBracedSingleImportee

scalafix-tests/output/src/main/scala-3/test/organizeImports/DeduplicateGivenImportees.scala

@@ -1,6 +1,6 @@
 package test.organizeImports
 
-import test.organizeImports.Givens._
+import test.organizeImports.Givens.*
 import test.organizeImports.Givens.given A
 import test.organizeImports.Givens.given B
 import test.organizeImports.Givens.given C

scalafix-tests/output/src/main/scala-3/test/organizeImports/DeduplicateImportees.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import scala.collection.immutable.Map as Dict
+import scala.collection.immutable.Vector
+import scala.collection.immutable.{Set as _, *}
+
+object DeduplicateImportees

scalafix-tests/output/src/main/scala-3/test/organizeImports/ExpandGiven.scala

@@ -4,6 +4,8 @@ import test.organizeImports.GivenImports.Alpha
 import test.organizeImports.GivenImports.Beta
 import test.organizeImports.GivenImports.given Alpha
 import test.organizeImports.GivenImports.given Beta
+import test.organizeImports.GivenImports2.given
+import test.organizeImports.GivenImports2.given Beta
 
 import scala.util.Either
 

scalafix-tests/output/src/main/scala-3/test/organizeImports/ExpandRelativeEmptyPackage.scala

@@ -0,0 +1,14 @@
+import P.*
+import Q.*
+import Q.x
+
+object P {
+  object x
+}
+
+object Q {
+  object x
+  object y
+}
+
+object ExpandRelativeEmptyPackage

scalafix-tests/output/src/main/scala-3/test/organizeImports/ExpandUnimportGiven.scala

@@ -2,9 +2,9 @@ package test.organizeImports
 
 import test.organizeImports.GivenImports.Alpha
 import test.organizeImports.GivenImports.Beta
+import test.organizeImports.GivenImports.alpha as _
 import test.organizeImports.GivenImports.given Alpha
-import test.organizeImports.GivenImports.{alpha => _}
-import test.organizeImports.GivenImports.{beta => _, given}
+import test.organizeImports.GivenImports.{beta as _, given}
 
 import scala.util.Either
 

scalafix-tests/output/src/main/scala-3/test/organizeImports/ExplodeImportsFormatPreserving.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import test.organizeImports.ExplodeImports.FormatPreserving.g1.a
+import test.organizeImports.ExplodeImports.FormatPreserving.g1.b
+import test.organizeImports.ExplodeImports.FormatPreserving.g2.{ c as C, * }
+
+object ExplodeImportsFormatPreserving

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedGivenImportsMergeUnimports.scala

@@ -1,8 +1,8 @@
 package test.organizeImports
 
-import test.organizeImports.GivenImports._
-import test.organizeImports.GivenImports.{gamma => _, given Beta, given Zeta, given}
-import test.organizeImports.GivenImports2.{alpha => _, beta => _}
+import test.organizeImports.GivenImports.*
+import test.organizeImports.GivenImports.{gamma as _, given Beta, given Zeta, given}
+import test.organizeImports.GivenImports2.{alpha as _, beta as _}
 import test.organizeImports.GivenImports2.{given Gamma, given Zeta}
 
 object GroupedGivenImportsMergeUnimports

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsAggressiveMergeGivenAll.scala

@@ -1,10 +1,10 @@
 package test.organizeImports
 
-import test.organizeImports.GivenImports._
+import test.organizeImports.GivenImports.*
 import test.organizeImports.GivenImports.given
-import test.organizeImports.MergeImports.Wildcard1._
-import test.organizeImports.MergeImports.Wildcard1.{b => B}
-import test.organizeImports.MergeImports.Wildcard2._
+import test.organizeImports.MergeImports.Wildcard1.*
+import test.organizeImports.MergeImports.Wildcard1.b as B
+import test.organizeImports.MergeImports.Wildcard2.*
 
 
 object GroupedImportsAggressiveMergeGivenAll

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsAggressiveMergeWildcard.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import test.organizeImports.MergeImports.Wildcard1.*
+import test.organizeImports.MergeImports.Wildcard1.b as B
+import test.organizeImports.MergeImports.Wildcard2.*
+
+object GroupedImportsAggressiveMergeWildcard

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsExplodeMixed.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import scala.collection.immutable.*
+import scala.collection.mutable.Map
+import scala.collection.mutable.{Buffer as _, Seq as S, *}
+
+object GroupedImportsExplodeMixed

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsExplodeUnimport.scala

@@ -0,0 +1,5 @@
+package test.organizeImports
+
+import scala.collection.{Seq as _, *}
+
+object GroupedImportExplodeUnimport

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsMergeDedup.scala

@@ -0,0 +1,5 @@
+package test.organizeImports
+
+import test.organizeImports.MergeImports.Dedup.{a, b as b1, c as _}
+
+object GroupedImportsMergeDedup

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsMergeRenames.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import test.organizeImports.MergeImports.Rename1.{a as A, b as B, c, d}
+import test.organizeImports.MergeImports.Rename2.{a as A, b as B, c}
+import test.organizeImports.MergeImports.Rename2.{a, b}
+
+object GroupedImportsMergeRenames

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsMergeUnimports.scala

@@ -0,0 +1,6 @@
+package test.organizeImports
+
+import test.organizeImports.MergeImports.Unimport1.{b as B, c as _, d, *}
+import test.organizeImports.MergeImports.Unimport2.{a as _, b as _, c as C, d}
+
+object GroupedImportsMergeUnimports

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupedImportsMergeWildcard.scala

@@ -0,0 +1,7 @@
+package test.organizeImports
+
+import test.organizeImports.MergeImports.Wildcard1.b as B
+import test.organizeImports.MergeImports.Wildcard1.{d, *}
+import test.organizeImports.MergeImports.Wildcard2.{a, b, *}
+
+object GroupedImportsMergeWildcard

scalafix-tests/output/src/main/scala-3/test/organizeImports/Groups.scala

@@ -0,0 +1,11 @@
+package test.organizeImports
+
+import java.time.Clock
+import javax.net.ssl
+
+import sun.misc.Unsafe
+
+import scala.collection.JavaConverters.*
+import scala.concurrent.ExecutionContext
+
+object Groups

scalafix-tests/output/src/main/scala-3/test/organizeImports/GroupsLongestMatch.scala

@@ -0,0 +1,14 @@
+package test.organizeImports
+
+import java.time.Clock
+import javax.net.ssl
+
+import scala.collection.JavaConverters.*
+import scala.concurrent.ExecutionContext
+
+import scala.util.Random
+import scala.util.control.NonFatal
+
+import sun.misc.Unsafe
+
+object GroupsLongestMatch

scalafix-tests/output/src/main/scala-3/test/organizeImports/ImportsOrderKeep.scala

@@ -0,0 +1,12 @@
+package test.organizeImports
+
+import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.e
+import test.organizeImports.QuotedIdent.*
+import test.organizeImports.QuotedIdent.`a.b`.{c as _, *}
+
+import scala.concurrent.ExecutionContext.Implicits.*
+import scala.concurrent.duration
+import scala.concurrent.*
+import scala.concurrent.{Promise, Future}
+
+object ImportsOrderKeep

scalafix-tests/output/src/main/scala-3/test/organizeImports/ImportsOrderSymbolsFirst.scala

@@ -0,0 +1,15 @@
+package test.organizeImports
+
+import test.organizeImports.QuotedIdent.*
+import test.organizeImports.QuotedIdent.`a.b`
+import test.organizeImports.QuotedIdent.`a.b` as ab
+import test.organizeImports.QuotedIdent.`a.b`.{c as _, *}
+import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.e
+import test.organizeImports.QuotedIdent.`a.b`.`{ d }`.e as E
+
+import scala.concurrent.*
+import scala.concurrent.{Promise, Future}
+import scala.concurrent.ExecutionContext.Implicits.*
+import scala.concurrent.duration
+
+object ImportsOrderSymbolsFirst