prepare Scala 2.13.13. sort imports

xuwei-k · Feb 23, 2024 · be51e87 · be51e87
1 parent 71d1f17
commit be51e87
Show file tree

Hide file tree

Showing 87 changed files with 401 additions and 167 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,6 @@ jobs:
         java-version: ${{ matrix.java }}
         distribution: temurin
     - uses: coursier/cache-action@v6
-    - run: sbt test
+    - run: sbt "rules2_13/scalafixAll --check OrganizeImports" test
     - if: matrix.os != 'windows-latest'
       run: sbt scalafmtSbtCheck scalafmtCheckAll
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,6 @@
+OrganizeImports {
+  expandRelative = true
+  groupExplicitlyImportedImplicitsSeparately = false
+  groups = ["*"]
+  removeUnused = true
+}
diff --git a/build.sbt b/build.sbt
@@ -109,6 +109,7 @@ lazy val rules = projectMatrix
     publishTo := sonatypePublishToBundle.value,
     libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % V.scalafixVersion,
     libraryDependencies += "org.scalatest" %% "scalatest-funsuite" % "3.2.18" % Test,
+    scalacOptions += "-Ywarn-unused:imports",
     Compile / sourceGenerators += task {
       val dir = (Compile / sourceManaged).value
       Seq(

diff --git a/rules/src/main/scala/fix/AddExplicitImplicitTypes.scala b/rules/src/main/scala/fix/AddExplicitImplicitTypes.scala
@@ -1,9 +1,15 @@
 package fix
 
+import scala.meta.Defn
+import scala.meta.Mod
+import scala.meta.Term
+import scala.meta.Type
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta._
+import scalafix.v1.XtensionSeqPatch
 
 /**
  * `implicit val foo = new Foo`

diff --git a/rules/src/main/scala/fix/AddLambdaParamParentheses.scala b/rules/src/main/scala/fix/AddLambdaParamParentheses.scala
@@ -1,10 +1,13 @@
 package fix
 
+import scala.meta.Term
+import scala.meta.Token
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Term
-import scala.meta.Token
+import scalafix.v1.XtensionSeqPatch
 
 class AddLambdaParamParentheses extends SyntacticRule("AddLambdaParamParentheses") {
   override def fix(implicit doc: SyntacticDocument): Patch = {

diff --git a/rules/src/main/scala/fix/CirceCodec.scala b/rules/src/main/scala/fix/CirceCodec.scala
@@ -1,21 +1,23 @@
 package fix
 
-import scalafix.Patch
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
-import scala.meta.Mod.Annot
-import scala.meta.Name.Indeterminate
-import scala.meta.Term.Select
 import scala.meta.Defn
 import scala.meta.Import
 import scala.meta.Importee
 import scala.meta.Importer
 import scala.meta.Init
 import scala.meta.Lit
+import scala.meta.Mod.Annot
+import scala.meta.Name.Indeterminate
 import scala.meta.Pkg
 import scala.meta.Source
 import scala.meta.Term
+import scala.meta.Term.Select
 import scala.meta.Type
+import scala.meta.XtensionCollectionLikeUI
+import scalafix.Patch
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 object CirceCodec {
   private sealed abstract class TypeClass extends Product with Serializable

diff --git a/rules/src/main/scala/fix/CollectHead.scala b/rules/src/main/scala/fix/CollectHead.scala
@@ -1,9 +1,11 @@
 package fix
 
+import scala.meta.Term
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Term
+import scalafix.v1.XtensionSeqPatch
 
 class CollectHead extends SyntacticRule("CollectHead") {
   override def fix(implicit doc: SyntacticDocument): Patch = {

diff --git a/rules/src/main/scala/fix/CollectHeadOption.scala b/rules/src/main/scala/fix/CollectHeadOption.scala
@@ -1,9 +1,11 @@
 package fix
 
+import scala.meta.Term
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Term
+import scalafix.v1.XtensionSeqPatch
 
 class CollectHeadOption extends SyntacticRule("CollectHeadOption") {
   override def fix(implicit doc: SyntacticDocument): Patch = {

diff --git a/rules/src/main/scala/fix/CompareSameValue.scala b/rules/src/main/scala/fix/CompareSameValue.scala
@@ -1,11 +1,15 @@
 package fix
 
 import scala.meta.Term
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
+import scala.meta.XtensionStructure
 import scalafix.Patch
 import scalafix.lint.Diagnostic
 import scalafix.lint.LintSeverity
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 private object CompareSameValue {
   private object X {

diff --git a/rules/src/main/scala/fix/DirectoryAndPackageName.scala b/rules/src/main/scala/fix/DirectoryAndPackageName.scala
@@ -1,21 +1,22 @@
 package fix
 
-import metaconfig.generic.Surface
+import java.io.File
+import java.util.Locale
 import metaconfig.ConfDecoder
 import metaconfig.Configured
+import metaconfig.generic.Surface
+import scala.meta.Pkg
+import scala.meta.Term
+import scala.meta.Tree
+import scala.meta.XtensionCollectionLikeUI
+import scala.meta.inputs.Input
 import scalafix.Diagnostic
 import scalafix.Patch
 import scalafix.lint.LintSeverity
 import scalafix.v1.Configuration
 import scalafix.v1.Rule
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import java.io.File
-import java.util.Locale
-import scala.meta.Pkg
-import scala.meta.Term
-import scala.meta.Tree
-import scala.meta.inputs.Input
 
 case class DirectoryAndPackageNameConfig(
   baseDirectory: Seq[String],

diff --git a/rules/src/main/scala/fix/DiscardSingleConfig.scala b/rules/src/main/scala/fix/DiscardSingleConfig.scala
@@ -1,9 +1,9 @@
 package fix
 
+import java.util.Locale
 import metaconfig.ConfDecoder
 import metaconfig.generic.Surface
 import scalafix.lint.LintSeverity
-import java.util.Locale
 
 case class DiscardSingleConfig(
   severity: LintSeverity

diff --git a/rules/src/main/scala/fix/DiscardValue.scala b/rules/src/main/scala/fix/DiscardValue.scala
@@ -9,6 +9,7 @@ import scala.meta.Stat
 import scala.meta.Template
 import scala.meta.Term
 import scala.meta.Tree
+import scala.meta.XtensionCollectionLikeUI
 import scala.meta.contrib.XtensionTreeOps
 import scalafix.Patch
 import scalafix.lint.Diagnostic
@@ -21,6 +22,8 @@ import scalafix.v1.SemanticRule
 import scalafix.v1.SemanticType
 import scalafix.v1.TypeRef
 import scalafix.v1.ValueSignature
+import scalafix.v1.XtensionOptionPatch
+import scalafix.v1.XtensionSeqPatch
 import scalafix.v1.XtensionTreeScalafix
 
 case class DiscardValueConfig(

diff --git a/rules/src/main/scala/fix/DuplicateWildcardImport.scala b/rules/src/main/scala/fix/DuplicateWildcardImport.scala
@@ -9,11 +9,15 @@ import scala.meta.Importer
 import scala.meta.Pkg
 import scala.meta.Source
 import scala.meta.Token
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
+import scala.meta.XtensionStructure
 import scalafix.Patch
 import scalafix.v1.Configuration
 import scalafix.v1.Rule
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 case class DuplicateWildcardImportConfig(isScala3: Boolean)
 

diff --git a/rules/src/main/scala/fix/EitherFold.scala b/rules/src/main/scala/fix/EitherFold.scala
@@ -1,14 +1,17 @@
 package fix
 
-import scalafix.Patch
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
 import scala.meta.Case
 import scala.meta.Pat
 import scala.meta.Term
 import scala.meta.Term.Block
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scala.meta.contrib.XtensionTreeOps
 import scala.meta.tokens.Token
+import scalafix.Patch
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 object EitherFold {
 

diff --git a/rules/src/main/scala/fix/EitherGetOrElse.scala b/rules/src/main/scala/fix/EitherGetOrElse.scala
@@ -1,13 +1,15 @@
 package fix
 
-import scalafix.Patch
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
 import scala.meta.Case
 import scala.meta.Pat
 import scala.meta.Term
 import scala.meta.Term.Block
+import scala.meta.XtensionCollectionLikeUI
 import scala.meta.contrib._
+import scalafix.Patch
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 object EitherGetOrElse {
   private abstract class Value(x: String) {

diff --git a/rules/src/main/scala/fix/EitherMap.scala b/rules/src/main/scala/fix/EitherMap.scala
@@ -1,11 +1,13 @@
 package fix
 
-import scalafix.Patch
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
 import scala.meta.Case
 import scala.meta.Pat
 import scala.meta.Term
+import scala.meta.XtensionCollectionLikeUI
+import scalafix.Patch
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 class EitherMap extends SyntacticRule("EitherMap") {
   private object RightMapIdentity {

diff --git a/rules/src/main/scala/fix/EtaExpand.scala b/rules/src/main/scala/fix/EtaExpand.scala
@@ -1,10 +1,13 @@
 package fix
 
+import scala.meta.Mod
+import scala.meta.Term
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Mod
-import scala.meta.Term
+import scalafix.v1.XtensionSeqPatch
 
 class EtaExpand extends SyntacticRule("EtaExpand") {
   override def fix(implicit doc: SyntacticDocument): Patch = {

diff --git a/rules/src/main/scala/fix/ExplicitImplicitTypes.scala b/rules/src/main/scala/fix/ExplicitImplicitTypes.scala
@@ -1,15 +1,8 @@
 package fix
 
-import metaconfig.generic.Surface
 import metaconfig.ConfDecoder
 import metaconfig.Configured
-import scalafix.Diagnostic
-import scalafix.Patch
-import scalafix.lint.LintSeverity
-import scalafix.v1.Configuration
-import scalafix.v1.Rule
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
+import metaconfig.generic.Surface
 import scala.annotation.tailrec
 import scala.meta.Ctor
 import scala.meta.Defn
@@ -18,7 +11,17 @@ import scala.meta.Pkg
 import scala.meta.Template
 import scala.meta.Term
 import scala.meta.Tree
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scala.meta.inputs.Position
+import scalafix.Diagnostic
+import scalafix.Patch
+import scalafix.lint.LintSeverity
+import scalafix.v1.Configuration
+import scalafix.v1.Rule
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 case class ExplicitImplicitTypesConfig(
   excludeLocal: Boolean

diff --git a/rules/src/main/scala/fix/ExtendsProductWithSerializable.scala b/rules/src/main/scala/fix/ExtendsProductWithSerializable.scala
@@ -5,9 +5,13 @@ import scala.meta.Defn
 import scala.meta.Mod
 import scala.meta.Template
 import scala.meta.Type
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
+import scala.meta.typeParamClauseToValues
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 /**
  * @see [[https://nrinaudo.github.io/scala-best-practices/adts/product_with_serializable.html]]

diff --git a/rules/src/main/scala/fix/FileNameConsistent.scala b/rules/src/main/scala/fix/FileNameConsistent.scala
@@ -1,16 +1,18 @@
 package fix
 
 import fix.FileNameConsistent._
-import scalafix.Diagnostic
-import scalafix.Patch
-import scalafix.lint.LintSeverity
-import scalafix.v1.SyntacticDocument
-import scalafix.v1.SyntacticRule
 import scala.meta.Defn
 import scala.meta.Pkg
 import scala.meta.Tree
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scala.meta.inputs.Input
 import scala.meta.inputs.Position
+import scalafix.Diagnostic
+import scalafix.Patch
+import scalafix.lint.LintSeverity
+import scalafix.v1.SyntacticDocument
+import scalafix.v1.SyntacticRule
 
 class FileNameConsistent extends SyntacticRule("FileNameConsistent") {
   override def isLinter = true

diff --git a/rules/src/main/scala/fix/FilterNot.scala b/rules/src/main/scala/fix/FilterNot.scala
@@ -3,9 +3,11 @@ package fix
 import fix.FilterNot._
 import scala.meta.Term
 import scala.meta.Term.ApplyUnary
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
+import scalafix.v1.XtensionSeqPatch
 
 object FilterNot {
   private object FilterValue {

diff --git a/rules/src/main/scala/fix/FilterSize.scala b/rules/src/main/scala/fix/FilterSize.scala
@@ -1,9 +1,11 @@
 package fix
 
+import scala.meta.Term
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Term
+import scalafix.v1.XtensionSeqPatch
 
 class FilterSize extends SyntacticRule("FilterSize") {
   override def fix(implicit doc: SyntacticDocument): Patch = {

diff --git a/rules/src/main/scala/fix/FinalObjectWarn.scala b/rules/src/main/scala/fix/FinalObjectWarn.scala
@@ -1,12 +1,16 @@
 package fix
 
+import scala.meta.Defn
+import scala.meta.Mod
+import scala.meta.XtensionClassifiable
+import scala.meta.XtensionCollectionLikeUI
 import scalafix.Patch
 import scalafix.lint.Diagnostic
 import scalafix.lint.LintSeverity
 import scalafix.v1.SyntacticDocument
 import scalafix.v1.SyntacticRule
-import scala.meta.Defn
-import scala.meta.Mod
+import scalafix.v1.XtensionOptionPatch
+import scalafix.v1.XtensionSeqPatch
 
 class FinalObjectWarn extends SyntacticRule("FinalObjectWarn") {
   override def fix(implicit doc: SyntacticDocument): Patch = {