luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweak SemComparator.expandWildcard to fix indentation

This commit is contained in:
João Ferreira 2024-10-08 01:15:44 +01:00
parent 28adb99031
commit 8a21e0d942
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala
View File

@ -12,15 +12,15 @@ final class SemComparator private (
val tags: Seq[String]) extends sbt.internal.librarymanagement.SemComparatorExtra with Serializable {
def matches(version: sbt.librarymanagement.VersionNumber): Boolean = this.matchesImpl(version)
def expandWildcard: Seq[SemComparator] = {
if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified) {
Seq(
this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte),
this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte)
)
} else { Seq(this) }
if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified)
Seq(
this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte),
this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte)
)
else Seq(this)
}
override def equals(o: Any): Boolean = this.eq(o.asInstanceOf[AnyRef]) || (o match {
case x: SemComparator => (this.op == x.op) && (this.major == x.major) && (this.minor == x.minor) && (this.patch == x.patch) && (this.tags == x.tags)
case _ => false

4
core/src/main/contraband/librarymanagement2.json
View File

@ -126,12 +126,12 @@
"extra": [
"def matches(version: sbt.librarymanagement.VersionNumber): Boolean = this.matchesImpl(version)",
"def expandWildcard: Seq[SemComparator] = {",
" if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified) {",
" if (op == sbt.internal.librarymanagement.SemSelOperator.Eq && !allFieldsSpecified)",
" Seq(",
" this.withOp(sbt.internal.librarymanagement.SemSelOperator.Gte),",
" this.withOp(sbt.internal.librarymanagement.SemSelOperator.Lte)",
" )",
" } else { Seq(this) }",
" else Seq(this)",
"}"
],
"extraCompanion": [