From 885cca3204a2bce4f0a56610b71375fa8950c9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Mon, 7 Oct 2024 23:38:35 +0100 Subject: [PATCH] fix indentation warnings --- .../librarymanagement/SemComparator.scala | 68 +++++++++--------- .../ivy/ExternalIvyConfigurationFormats.scala | 54 +++++++------- .../ivy/InlineIvyConfigurationFormats.scala | 70 +++++++++---------- .../ivy/IvyConfigurationFormats.scala | 2 +- 4 files changed, 97 insertions(+), 97 deletions(-) diff --git a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala index 2baccd6b9..25765e8f8 100644 --- a/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala +++ b/core/src/main/contraband-scala/sbt/internal/librarymanagement/SemComparator.scala @@ -13,42 +13,42 @@ final class SemComparator private ( 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) } -} + 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 -}) -override def hashCode: Int = { - 37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.internal.librarymanagement.SemComparator".##) + op.##) + major.##) + minor.##) + patch.##) + tags.##) -} -override def toString: String = { - this.toStringImpl -} -private[this] def copy(op: sbt.internal.librarymanagement.SemSelOperator = op, major: Option[Long] = major, minor: Option[Long] = minor, patch: Option[Long] = patch, tags: Seq[String] = tags): SemComparator = { - new SemComparator(op, major, minor, patch, tags) -} -def withOp(op: sbt.internal.librarymanagement.SemSelOperator): SemComparator = { - copy(op = op) -} -def withMajor(major: Option[Long]): SemComparator = { - copy(major = major) -} -def withMinor(minor: Option[Long]): SemComparator = { - copy(minor = minor) -} -def withPatch(patch: Option[Long]): SemComparator = { - copy(patch = patch) -} -def withTags(tags: Seq[String]): SemComparator = { - copy(tags = tags) -} + 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 + }) + override def hashCode: Int = { + 37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.internal.librarymanagement.SemComparator".##) + op.##) + major.##) + minor.##) + patch.##) + tags.##) + } + override def toString: String = { + this.toStringImpl + } + private[this] def copy(op: sbt.internal.librarymanagement.SemSelOperator = op, major: Option[Long] = major, minor: Option[Long] = minor, patch: Option[Long] = patch, tags: Seq[String] = tags): SemComparator = { + new SemComparator(op, major, minor, patch, tags) + } + def withOp(op: sbt.internal.librarymanagement.SemSelOperator): SemComparator = { + copy(op = op) + } + def withMajor(major: Option[Long]): SemComparator = { + copy(major = major) + } + def withMinor(minor: Option[Long]): SemComparator = { + copy(minor = minor) + } + def withPatch(patch: Option[Long]): SemComparator = { + copy(patch = patch) + } + def withTags(tags: Seq[String]): SemComparator = { + copy(tags = tags) + } } object SemComparator extends sbt.internal.librarymanagement.SemComparatorFunctions { def apply(comparator: String): SemComparator = parse(comparator) diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala index 49c66fc7b..553943e65 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala @@ -36,32 +36,32 @@ trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.for with sbt.librarymanagement.SftpRepositoryFormats with sbt.librarymanagement.PasswordAuthenticationFormats with sbt.librarymanagement.KeyFileAuthenticationFormats => -implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] { - override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.ExternalIvyConfiguration = { - __jsOpt match { - case Some(__js) => - unbuilder.beginObject(__js) - val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock") - val log = unbuilder.readField[Option[xsbti.Logger]]("log") - val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions") - val baseDirectory = unbuilder.readField[Option[java.io.File]]("baseDirectory") - val uri = unbuilder.readField[Option[java.net.URI]]("uri") - val extraResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("extraResolvers") - unbuilder.endObject() - sbt.librarymanagement.ivy.ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers) - case None => - deserializationError("Expected JsObject but found None") + implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] { + override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.ExternalIvyConfiguration = { + __jsOpt match { + case Some(__js) => + unbuilder.beginObject(__js) + val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock") + val log = unbuilder.readField[Option[xsbti.Logger]]("log") + val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions") + val baseDirectory = unbuilder.readField[Option[java.io.File]]("baseDirectory") + val uri = unbuilder.readField[Option[java.net.URI]]("uri") + val extraResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("extraResolvers") + unbuilder.endObject() + sbt.librarymanagement.ivy.ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers) + case None => + deserializationError("Expected JsObject but found None") + } + } + override def write[J](obj: sbt.librarymanagement.ivy.ExternalIvyConfiguration, builder: Builder[J]): Unit = { + builder.beginObject() + builder.addField("lock", obj.lock) + builder.addField("log", obj.log) + builder.addField("updateOptions", obj.updateOptions) + builder.addField("baseDirectory", obj.baseDirectory) + builder.addField("uri", obj.uri) + builder.addField("extraResolvers", obj.extraResolvers) + builder.endObject() + } } - } - override def write[J](obj: sbt.librarymanagement.ivy.ExternalIvyConfiguration, builder: Builder[J]): Unit = { - builder.beginObject() - builder.addField("lock", obj.lock) - builder.addField("log", obj.log) - builder.addField("updateOptions", obj.updateOptions) - builder.addField("baseDirectory", obj.baseDirectory) - builder.addField("uri", obj.uri) - builder.addField("extraResolvers", obj.extraResolvers) - builder.endObject() - } -} } diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala index 28fbd616f..22f92e099 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala @@ -38,40 +38,40 @@ trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.forma with sbt.librarymanagement.SftpRepositoryFormats with sbt.librarymanagement.PasswordAuthenticationFormats with sbt.librarymanagement.KeyFileAuthenticationFormats => -implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] { - override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.InlineIvyConfiguration = { - __jsOpt match { - case Some(__js) => - unbuilder.beginObject(__js) - val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock") - val log = unbuilder.readField[Option[xsbti.Logger]]("log") - val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions") - val paths = unbuilder.readField[Option[sbt.librarymanagement.ivy.IvyPaths]]("paths") - val resolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("resolvers") - val otherResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("otherResolvers") - val moduleConfigurations = unbuilder.readField[Vector[sbt.librarymanagement.ModuleConfiguration]]("moduleConfigurations") - val checksums = unbuilder.readField[Vector[String]]("checksums") - val managedChecksums = unbuilder.readField[Boolean]("managedChecksums") - val resolutionCacheDir = unbuilder.readField[Option[java.io.File]]("resolutionCacheDir") - unbuilder.endObject() - sbt.librarymanagement.ivy.InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir) - case None => - deserializationError("Expected JsObject but found None") + implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] { + override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.InlineIvyConfiguration = { + __jsOpt match { + case Some(__js) => + unbuilder.beginObject(__js) + val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock") + val log = unbuilder.readField[Option[xsbti.Logger]]("log") + val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions") + val paths = unbuilder.readField[Option[sbt.librarymanagement.ivy.IvyPaths]]("paths") + val resolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("resolvers") + val otherResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("otherResolvers") + val moduleConfigurations = unbuilder.readField[Vector[sbt.librarymanagement.ModuleConfiguration]]("moduleConfigurations") + val checksums = unbuilder.readField[Vector[String]]("checksums") + val managedChecksums = unbuilder.readField[Boolean]("managedChecksums") + val resolutionCacheDir = unbuilder.readField[Option[java.io.File]]("resolutionCacheDir") + unbuilder.endObject() + sbt.librarymanagement.ivy.InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir) + case None => + deserializationError("Expected JsObject but found None") + } + } + override def write[J](obj: sbt.librarymanagement.ivy.InlineIvyConfiguration, builder: Builder[J]): Unit = { + builder.beginObject() + builder.addField("lock", obj.lock) + builder.addField("log", obj.log) + builder.addField("updateOptions", obj.updateOptions) + builder.addField("paths", obj.paths) + builder.addField("resolvers", obj.resolvers) + builder.addField("otherResolvers", obj.otherResolvers) + builder.addField("moduleConfigurations", obj.moduleConfigurations) + builder.addField("checksums", obj.checksums) + builder.addField("managedChecksums", obj.managedChecksums) + builder.addField("resolutionCacheDir", obj.resolutionCacheDir) + builder.endObject() + } } - } - override def write[J](obj: sbt.librarymanagement.ivy.InlineIvyConfiguration, builder: Builder[J]): Unit = { - builder.beginObject() - builder.addField("lock", obj.lock) - builder.addField("log", obj.log) - builder.addField("updateOptions", obj.updateOptions) - builder.addField("paths", obj.paths) - builder.addField("resolvers", obj.resolvers) - builder.addField("otherResolvers", obj.otherResolvers) - builder.addField("moduleConfigurations", obj.moduleConfigurations) - builder.addField("checksums", obj.checksums) - builder.addField("managedChecksums", obj.managedChecksums) - builder.addField("resolutionCacheDir", obj.resolutionCacheDir) - builder.endObject() - } -} } diff --git a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala index cbab06322..324710d4f 100644 --- a/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala +++ b/ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala @@ -41,5 +41,5 @@ trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.Glo with sbt.librarymanagement.SftpRepositoryFormats with sbt.librarymanagement.PasswordAuthenticationFormats with sbt.librarymanagement.KeyFileAuthenticationFormats => -implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.librarymanagement.ivy.IvyConfiguration, sbt.librarymanagement.ivy.InlineIvyConfiguration, sbt.librarymanagement.ivy.ExternalIvyConfiguration]("type") + implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.librarymanagement.ivy.IvyConfiguration, sbt.librarymanagement.ivy.InlineIvyConfiguration, sbt.librarymanagement.ivy.ExternalIvyConfiguration]("type") }