Skip to content

Commit e1e7a42

Browse files
committed
ScalafmtPlugin: fix version tags comparison
1 parent 4c8a4f7 commit e1e7a42

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,9 @@ object ScalafmtPlugin extends AutoPlugin {
148148
}).foreach { v =>
149149
val minvn = VersionNumber(v)
150150
val cmpnum = cmp(minvn.numbers, curvn.numbers)
151-
val bad = cmpnum > 0 || cmpnum == 0 && {
152-
val mintags = minvn.tags
153-
val curtags = curvn.tags
154-
if (mintags.isEmpty) curtags.nonEmpty
155-
else curtags.isEmpty || cmp(mintags, curtags) > 0
156-
}
151+
val bad = cmpnum > 0 ||
152+
cmpnum == 0 && curvn.tags.nonEmpty &&
153+
(minvn.tags.isEmpty || cmp(minvn.tags, curvn.tags) > 0)
157154
if (bad) sys.error(s"sbt-scalafmt requires sbt $v+ [current=$sbtVersion")
158155
}
159156
}

0 commit comments

Comments
 (0)