Merge pull request #7810 from xuwei-k/scalafmt-3-8

[2.x] Update scalafmt
This commit is contained in:
eugene yokota 2024-10-22 09:56:51 -04:00 committed by GitHub
commit c4b5119630
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 40 additions and 38 deletions

View File

@ -1,4 +1,4 @@
version = 3.7.14
version = 3.8.3
runner.dialect = scala3
maxColumn = 100

View File

@ -79,31 +79,30 @@ final case class ResolutionParams(
)
}
override lazy val hashCode =
this match {
case ResolutionParams(
a1,
a2,
a3,
a4,
a5,
a6,
a7,
a8,
a9,
a10,
a11,
a12,
a13,
a14,
a15,
a16,
a17
) =>
(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17).##
}
override lazy val hashCode = this match {
case ResolutionParams(
a1,
a2,
a3,
a4,
a5,
a6,
a7,
a8,
a9,
a10,
a11,
a12,
a13,
a14,
a15,
a16,
a17
) =>
(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17).##
}
// ResolutionParams.unapply(this).get.##
// ResolutionParams.unapply(this).get.##
}

View File

@ -3923,7 +3923,7 @@ object Classpaths {
val pluginClasspath = unit.plugins.fullClasspath.toVector
val pluginJars = pluginClasspath.filter: x =>
!Files.isDirectory(converter.toPath(x.data))
// exclude directories: an approximation to whether they've been published
// exclude directories: an approximation to whether they've been published
val pluginIDs: Vector[ModuleID] = pluginJars.flatMap(_.get(moduleIDStr).map: str =>
moduleIdJsonKeyFormat.read(str))
GetClassifiersModule(

View File

@ -73,15 +73,15 @@ object Act {
structure: BuildStructure
): KeysParser =
for (
selected <- scopedKeySelected(
structure.index.aggregateKeyIndex,
current,
defaultConfigs,
structure.index.keyMap,
structure.data,
askProject = true,
selected <- scopedKeySelected(
structure.index.aggregateKeyIndex,
current,
defaultConfigs,
structure.index.keyMap,
structure.data,
askProject = true,
)
)
)
yield Aggregation.aggregate(
selected.key.asInstanceOf[ScopedKey[Any]],
selected.mask,

View File

@ -153,14 +153,17 @@ class JUnitXmlTestsListener(val targetDir: File, legacyTestReport: Boolean, logg
<error message={e.throwable.get.getMessage} type={
e.throwable.get.getClass.getName
}>{trace}</error>
case TStatus.Error => <error message={"No Exception or message provided"}/>
case TStatus.Error =>
<error message={"No Exception or message provided"}/>
case TStatus.Failure if (e.throwable.isDefined) =>
<failure message={e.throwable.get.getMessage} type={
e.throwable.get.getClass.getName
}>{trace}</failure>
case TStatus.Failure => <failure message={"No Exception or message provided"}/>
case TStatus.Ignored | TStatus.Skipped | TStatus.Pending => <skipped/>
case _ => {}
case TStatus.Failure =>
<failure message={"No Exception or message provided"}/>
case TStatus.Ignored | TStatus.Skipped | TStatus.Pending =>
<skipped/>
case _ => {}
}
}
</testcase>