Apply suggestions from code review

Co-authored-by: Brice Jaglin <bjaglin@gmail.com>
scalacenter · Jan 23, 2024 · ea46fa7 · ea46fa7
1 parent a6f4113
commit ea46fa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/main/scala/scalafix/internal/sbt/ScalafixInterface.scala b/src/main/scala/scalafix/internal/sbt/ScalafixInterface.scala
@@ -123,19 +123,6 @@ object ScalafixInterface {
 
   private[scalafix] val defaultLogger: Logger = ConsoleLogger(System.out)
 
-  def fromToolClasspath(
-      scalafixBinaryScalaVersion: String,
-      scalafixDependencies: Seq[ModuleID],
-      scalafixCustomResolvers: Seq[Repository],
-      logger: Logger = defaultLogger
-  ): () => ScalafixInterface =
-    fromToolClasspath(
-      scalafixBinaryScalaVersion = scalafixBinaryScalaVersion,
-      scalafixDependencies = scalafixDependencies,
-      scalafixCustomResolvers = scalafixCustomResolvers,
-      logger = logger,
-      callback = new ScalafixLogger(logger)
-    )
 
   def fromToolClasspath(
       scalafixBinaryScalaVersion: String,

diff --git a/src/main/scala/scalafix/sbt/ScalafixPlugin.scala b/src/main/scala/scalafix/sbt/ScalafixPlugin.scala
@@ -77,7 +77,10 @@ object ScalafixPlugin extends AutoPlugin {
       )
 
     val scalafixCallback: SettingKey[ScalafixMainCallback] =
-      settingKey[ScalafixMainCallback]("")
+      settingKey[ScalafixMainCallback](
+        "The handler for the diagnostics emitted during scalafix execution. Can be set in ThisBuild or at project-level. " +
+          "Defaults to a wrapper around `sbt.Logger`."
+      )
 
     val scalafixSemanticdb: ModuleID =
       scalafixSemanticdb(BuildInfo.scalametaVersion)
@@ -162,13 +165,12 @@ object ScalafixPlugin extends AutoPlugin {
         SettingKey[Boolean]("bspEnabled") := false
       )
     ),
-    scalafixCallback := new ScalafixLogger(ScalafixInterface.defaultLogger),
     scalafixInterfaceProvider := ScalafixInterface.fromToolClasspath(
       scalafixScalaBinaryVersion.value,
       scalafixDependencies = scalafixDependencies.value,
       scalafixCustomResolvers = scalafixResolvers.value,
       logger = ScalafixInterface.defaultLogger,
-      callback = scalafixCallback.value
+      callback = (ThisBuild / scalafixCallback).value
     ),
     update := {
       object SemanticdbScalac {
@@ -206,6 +208,7 @@ object ScalafixPlugin extends AutoPlugin {
   )
 
   override lazy val globalSettings: Seq[Def.Setting[_]] = Seq(
+    scalafixCallback := new ScalafixLogger(ScalafixInterface.defaultLogger),
     scalafixConfig := None, // let scalafix-cli try to infer $CWD/.scalafix.conf
     scalafixOnCompile := false,
     scalafixCaching := true,