Merge pull request #3009 from scala-steward-org/topic/reformatChanged-buildRoot

Reformat changed files in all build roots

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/buildtool/BuildToolDispatcher.scala

@@ -53,9 +53,6 @@ final class BuildToolDispatcher[F[_]](implicit
       buildTools.traverse_(_.runMigration(buildRoot, migration))
     })
 
-  private def getBuildRoots(repo: Repo, repoConfig: RepoConfig): List[BuildRoot] =
-    repoConfig.buildRootsOrDefault.map(buildRootCfg => BuildRoot(repo, buildRootCfg.relativePath))
-
   private val allBuildTools = List(mavenAlg, millAlg, sbtAlg, scalaCliAlg)
   private val fallbackBuildTool = List(sbtAlg)
 
@@ -69,5 +66,5 @@ final class BuildToolDispatcher[F[_]](implicit
       repo: Repo,
       repoConfig: RepoConfig
   ): F[List[(BuildRoot, List[BuildToolAlg[F]])]] =
-    getBuildRoots(repo, repoConfig).traverse(findBuildTools)
+    repoConfig.buildRootsOrDefault(repo).traverse(findBuildTools)
 }

modules/core/src/main/scala/org/scalasteward/core/edit/EditAlg.scala

@@ -118,8 +118,10 @@ final class EditAlg[F[_]](implicit
     val reformat =
       data.config.scalafmt.runAfterUpgradingOrDefault && data.cache.dependsOn(List(scalafmtModule))
     F.whenA(reformat) {
-      logger.attemptWarn.log_("Reformatting changed files failed") {
-        scalafmtAlg.reformatChanged(data.repo)
+      data.config.buildRootsOrDefault(data.repo).traverse_ { buildRoot =>
+        logger.attemptWarn.log_(s"Reformatting changed files failed in ${buildRoot.relativePath}") {
+          scalafmtAlg.reformatChanged(buildRoot)
+        }
       }
     }
   }

modules/core/src/main/scala/org/scalasteward/core/repoconfig/RepoConfig.scala

@@ -22,6 +22,8 @@ import io.circe.Codec
 import io.circe.generic.extras.Configuration
 import io.circe.generic.extras.semiauto._
 import io.circe.syntax._
+import org.scalasteward.core.buildtool.BuildRoot
+import org.scalasteward.core.data.Repo
 import org.scalasteward.core.edit.hooks.PostUpdateHook
 
 final case class RepoConfig(
@@ -36,10 +38,11 @@ final case class RepoConfig(
     reviewers: List[String] = List.empty,
     dependencyOverrides: List[GroupRepoConfig] = List.empty
 ) {
-  def buildRootsOrDefault: List[BuildRootConfig] =
+  def buildRootsOrDefault(repo: Repo): List[BuildRoot] =
     buildRoots
       .map(_.filterNot(_.relativePath.contains("..")))
       .getOrElse(List(BuildRootConfig.repoRoot))
+      .map(cfg => BuildRoot(repo, cfg.relativePath))
 
   def postUpdateHooksOrDefault: List[PostUpdateHook] =
     postUpdateHooks.getOrElse(Nil).map(_.toHook)

modules/core/src/main/scala/org/scalasteward/core/scalafmt/ScalafmtAlg.scala

@@ -22,7 +22,7 @@ import cats.syntax.all._
 import io.circe.ParsingFailure
 import org.scalasteward.core.application.Config
 import org.scalasteward.core.buildtool.BuildRoot
-import org.scalasteward.core.data.{Repo, Scope, Version}
+import org.scalasteward.core.data.{Scope, Version}
 import org.scalasteward.core.io.process.SlurpOptions
 import org.scalasteward.core.io.{FileAlg, ProcessAlg, WorkspaceAlg}
 import org.scalasteward.core.scalafmt.ScalafmtAlg.{opts, parseScalafmtConf}
@@ -52,11 +52,11 @@ final class ScalafmtAlg[F[_]](config: Config)(implicit
       .map(version => Scope(List(scalafmtDependency(version)), List(config.defaultResolver)))
       .value
 
-  def reformatChanged(repo: Repo): F[Unit] =
+  def reformatChanged(buildRoot: BuildRoot): F[Unit] =
     for {
-      repoDir <- workspaceAlg.repoDir(repo)
+      buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
       cmd = Nel.of(scalafmtBinary, opts.nonInteractive) ++ opts.modeChanged
-      _ <- processAlg.exec(cmd, repoDir, slurpOptions = SlurpOptions.ignoreBufferOverflow)
+      _ <- processAlg.exec(cmd, buildRootDir, slurpOptions = SlurpOptions.ignoreBufferOverflow)
     } yield ()
 
   def version: F[String] = {

modules/core/src/test/scala/org/scalasteward/core/repoconfig/RepoConfigAlgTest.scala

@@ -243,8 +243,9 @@ class RepoConfigAlgTest extends FunSuite {
   }
 
   test("build root with '..'") {
+    val repo = Repo("typelevel", "cats")
     val content = """buildRoots = [ "../../../etc" ]"""
-    val config = RepoConfigAlg.parseRepoConfig(content).map(_.buildRootsOrDefault)
+    val config = RepoConfigAlg.parseRepoConfig(content).map(_.buildRootsOrDefault(repo))
     assertEquals(config, Right(Nil))
   }