[Scala 3] Add support for given imports

README.adoc

@@ -88,8 +88,7 @@ Running the rule on source files compiled with Scala 3 is still experimental.
 Known limitations:
 
 . You must use Scalafix 0.9.28 or later
-. The <<removeUnused, `removeUnused`>> option must be explicitly set to `false`
-. Source files using new syntax introduced in Scala 3 such as https://docs.scala-lang.org/scala3/book/ca-given-imports.html[`given` imports] may not work properly 
+. The <<removeUnused, `removeUnused`>> option must be explicitly set to `false` - the rule currently doesn't remove unused imports as it's currently not supported by the compiler.
 . Usage of http://dotty.epfl.ch/docs/reference/dropped-features/package-objects.html[deprecated package objects] may result in incorrect imports
 . The <<groupExplicitlyImportedImplicitsSeparately, groupExplicitlyImportedImplicitsSeparately>> option has no effect
 

input/src/main/scala-3/fix/CoalesceGivenImportees.scala

@@ -0,0 +1,14 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports {
+  groupedImports = Keep
+  coalesceToWildcardImportThreshold = 2
+  removeUnused = false
+}
+ */
+package fix
+
+import fix.GivenImports.{Alpha, Beta, Zeta}
+import fix.GivenImports.{given Alpha, given Beta, given Zeta}
+
+object CoalesceGivenImportees

input/src/main/scala-3/fix/DeduplicateGivenImportees.scala

@@ -0,0 +1,13 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+ */
+package fix
+
+import fix.GivenImports._
+import fix.GivenImports.{given Beta, given Alpha}
+import fix.GivenImports.given Beta
+import fix.GivenImports.given Alpha
+import fix.GivenImports.given Alpha
+
+object DeduplicateGivenImportees

input/src/main/scala-3/fix/ExpandGiven.scala

@@ -0,0 +1,12 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+ */
+package fix
+
+import fix.GivenImports.Beta
+import fix.GivenImports.Alpha
+import fix.GivenImports.{given Beta, given Alpha}
+import scala.util.Either
+
+object ExpandGiven

input/src/main/scala-3/fix/ExpandUnimportGiven.scala

@@ -0,0 +1,14 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+ */
+package fix
+
+import fix.GivenImports.Beta
+import fix.GivenImports.Alpha
+import fix.GivenImports.{given Alpha}
+import fix.GivenImports.{alpha => _}
+import fix.GivenImports.{beta => _, given}
+import scala.util.Either
+
+object ExpandUnimportGiven

input/src/main/scala-3/fix/GroupedGivenImportsMergeUnimports.scala

@@ -0,0 +1,19 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+OrganizeImports.groupedImports = Merge
+ */
+package fix
+
+import fix.GivenImports._
+import fix.GivenImports.{alpha => _, given}
+import fix.GivenImports.{ given Beta }
+import fix.GivenImports.{gamma => _, given}
+import fix.GivenImports.{ given Zeta }
+
+import fix.GivenImports2.{alpha => _}
+import fix.GivenImports2.{beta => _}
+import fix.GivenImports2.{ given Gamma }
+import fix.GivenImports2.{ given Zeta }
+
+object GroupedGivenImportsMergeUnimports

input/src/main/scala-3/fix/GroupedImportsAggressiveMergeGivenAll.scala

@@ -0,0 +1,23 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+OrganizeImports.groupedImports = AggressiveMerge
+ */
+package fix
+
+import fix.MergeImports.Wildcard1._
+import fix.MergeImports.Wildcard1.{a => _, _}
+import fix.MergeImports.Wildcard1.{b => B}
+import fix.MergeImports.Wildcard1.{c => _, _}
+import fix.MergeImports.Wildcard1.d
+
+import fix.GivenImports._
+import fix.GivenImports.{Alpha, Beta, Zeta}
+import fix.GivenImports.{given Alpha, given Beta, given Zeta}
+import fix.GivenImports.given
+
+import fix.MergeImports.Wildcard2._
+import fix.MergeImports.Wildcard2.{a, b}
+
+
+object GroupedImportsAggressiveMergeGivenAll

input/src/main/scala-3/fix/MergeGiven.scala

@@ -0,0 +1,14 @@
+/*
+rules = [OrganizeImports]
+OrganizeImports.removeUnused = false
+OrganizeImports.groupedImports = Merge
+ */
+package fix
+
+import fix.GivenImports.Beta
+import fix.GivenImports.Alpha
+import fix.GivenImports.{given Beta}
+import fix.GivenImports.{given Alpha}
+import scala.util.Either
+
+object MergeGiven

output/src/main/scala-3/fix/CoalesceGivenImportees.scala

@@ -0,0 +1,6 @@
+package fix
+
+import fix.GivenImports._
+import fix.GivenImports.given
+
+object CoalesceGivenImportees

output/src/main/scala-3/fix/DeduplicateGivenImportees.scala

@@ -0,0 +1,7 @@
+package fix
+
+import fix.GivenImports._
+import fix.GivenImports.{ given Alpha }
+import fix.GivenImports.{ given Beta }
+
+object DeduplicateGivenImportees

output/src/main/scala-3/fix/ExpandGiven.scala

@@ -0,0 +1,10 @@
+package fix
+
+import fix.GivenImports.Alpha
+import fix.GivenImports.Beta
+import fix.GivenImports.{ given Alpha }
+import fix.GivenImports.{ given Beta }
+
+import scala.util.Either
+
+object ExpandGiven

output/src/main/scala-3/fix/ExpandUnimportGiven.scala

@@ -0,0 +1,11 @@
+package fix
+
+import fix.GivenImports.Alpha
+import fix.GivenImports.Beta
+import fix.GivenImports.{given Alpha}
+import fix.GivenImports.{alpha => _}
+import fix.GivenImports.{beta => _, given}
+
+import scala.util.Either
+
+object ExpandUnimportGiven

output/src/main/scala-3/fix/GroupedGivenImportsMergeUnimports.scala

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

output/src/main/scala-3/fix/GroupedImportsAggressiveMergeGivenAll.scala

@@ -0,0 +1,10 @@
+package fix
+
+import fix.GivenImports._
+import fix.GivenImports.given
+import fix.MergeImports.Wildcard1._
+import fix.MergeImports.Wildcard1.{b => B}
+import fix.MergeImports.Wildcard2._
+
+
+object GroupedImportsAggressiveMergeGivenAll

output/src/main/scala-3/fix/MergeGiven.scala

@@ -0,0 +1,8 @@
+package fix
+
+import fix.GivenImports.{Alpha, Beta}
+import fix.GivenImports.{given Alpha, given Beta}
+
+import scala.util.Either
+
+object MergeGiven