Skip to content

Commit fa9f0f3

Browse files
rtyleyJamieB-gu
andcommitted
WIP: Group updates by Edit
Co-authored-by: Jamie B <53781962+JamieB-gu@users.noreply.github.com>
1 parent 7745bda commit fa9f0f3

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ final class EditAlg[F[_]](implicit
6767
} yield preScalafixEdits ++ updateEdit ++ postScalafixEdits ++ hooksEdits
6868
}
6969

70-
private def findUpdateReplacements(
70+
def findUpdateReplacements(
7171
repo: Repo,
7272
config: RepoConfig,
7373
update: Update.Single

modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,24 @@ final class NurtureAlg[F[_]](config: ForgeCfg)(implicit
4747
urlChecker: UrlChecker[F],
4848
F: Concurrent[F]
4949
) {
50-
def nurture(data: RepoData, fork: RepoOut, updates: Nel[Update.ForArtifactId]): F[Unit] =
50+
def nurture(data: RepoData, fork: RepoOut, updates: Nel[Update.ForArtifactId]): F[Unit] = {
51+
52+
5153
for {
5254
_ <- logger.info(s"Nurture ${data.repo.show}")
5355
baseBranch <- cloneAndSync(data.repo, fork)
56+
updatesGroupedByReplacements <- updates.traverse(update => editAlg.findUpdateReplacements(fork.repo, data.config, update).map(update -> _)).map {
57+
_.toList.groupMap(_._2)(_._1)
58+
}
59+
5460
(grouped, notGrouped) = Update.groupByPullRequestGroup(
5561
data.config.pullRequestsOrDefault.groupingOrDefault,
5662
updates.toList
5763
)
5864
finalUpdates = Update.groupByGroupId(notGrouped) ++ grouped
5965
_ <- updateDependencies(data, fork.repo, baseBranch, finalUpdates)
6066
} yield ()
67+
}
6168

6269
private def cloneAndSync(repo: Repo, fork: RepoOut): F[Branch] =
6370
for {

0 commit comments

Comments
 (0)