Skip to content

Commit 79dd490

Browse files
committed
Scalafmt
1 parent e49384b commit 79dd490

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/MillAlg.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ final class MillAlg[F[_]](defaultResolvers: List[Resolver])(implicit
9696
buildRootDir / s".$millVersionName",
9797
buildRootDir / ".config" / millVersionName
9898
).collectFirstSomeM(fileAlg.readFile).map(_.flatMap(parser.parseMillVersion))
99-
val fromBuildFile = List(buildRootDir / "build.mill", buildRootDir / "build.mill.scala", buildRootDir / "build.sc")
99+
val fromBuildFile = List(
100+
buildRootDir / "build.mill",
101+
buildRootDir / "build.mill.scala",
102+
buildRootDir / "build.sc"
103+
)
100104
.collectFirstSomeM(fileAlg.readFile)
101105
.map(_.flatMap(parser.parseBuildFileMillVersion))
102106

modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/parser.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ object parser {
4747
Option(s.trim).filter(_.nonEmpty).map(Version.apply)
4848

4949
private val millVersionRegex = """\s*\/\/\|\s*mill-version:\s*['"]?(.+?)['"]?\s*""".r
50-
def parseBuildFileMillVersion(s: String): Option[Version] = {
51-
s.linesIterator.collectFirst {
52-
case millVersionRegex(version) => Version(version)
50+
def parseBuildFileMillVersion(s: String): Option[Version] =
51+
s.linesIterator.collectFirst { case millVersionRegex(version) =>
52+
Version(version)
5353
}
54-
}
5554

5655
/** Used to correctly format the Mill plugin artifacts will when included look like:
5756
* - import $ivy.`com.goyeau::mill-scalafix::0.2.10`

modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillVersionParserTest.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ class MillVersionParserTest extends FunSuite {
2222

2323
test(s"parse version from build.mill file") {
2424
val buildMillFileContent = """
25-
|//| mill-version: 1.0.5
26-
|""".stripMargin
25+
|//| mill-version: 1.0.5
26+
|""".stripMargin
2727
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
2828
assertEquals(parsed, Some("1.0.5"))
2929
}
3030

3131
test(s"parse quoted version from build.mill file") {
3232
val buildMillFileContent = """
33-
|//| mill-version: "1.0.5"
34-
|""".stripMargin
33+
|//| mill-version: "1.0.5"
34+
|""".stripMargin
3535
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
3636
assertEquals(parsed, Some("1.0.5"))
3737
}
3838

3939
test(s"parse single quoted version from build.mill file") {
4040
val buildMillFileContent = """
41-
|//| mill-version: '1.0.5'
42-
|""".stripMargin
41+
|//| mill-version: '1.0.5'
42+
|""".stripMargin
4343
val parsed = parser.parseBuildFileMillVersion(buildMillFileContent).map(_.value)
4444
assertEquals(parsed, Some("1.0.5"))
4545
}

0 commit comments

Comments
 (0)