From a3ac4c76a637b73ab9d9375e7b8a0cf53d49204e Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 17 Jul 2019 19:34:51 -0700 Subject: [PATCH] Bump scalafmt Intellij had issues resolving 2.0.0-RCX so it will be nice to be using the latest. --- .scalafmt.conf | 2 +- .../src/test/scala/SettingsTest.scala | 6 +- main-actions/src/main/scala/sbt/Tests.scala | 5 +- .../src/test/scala/sbt/CacheIvyTest.scala | 31 +++++---- .../scala/sbt/BuildSettingsInstances.scala | 7 +- main/src/main/scala/sbt/Defaults.scala | 22 +++---- main/src/main/scala/sbt/Main.scala | 23 ++++--- main/src/main/scala/sbt/Plugins.scala | 5 +- main/src/main/scala/sbt/internal/Act.scala | 36 +++++----- .../main/scala/sbt/internal/Aggregation.scala | 5 +- .../main/scala/sbt/internal/BuildLoader.scala | 9 ++- .../sbt/internal/SettingCompletions.scala | 3 +- .../test/scala/sbt/internal/TestBuild.scala | 14 ++-- .../scala/sbt/JUnitXmlTestsListener.scala | 65 +++++++++---------- 14 files changed, 114 insertions(+), 119 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c9dd647d2..8a81e8505 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 2.0.0-RC5 +version = 2.0.0 maxColumn = 100 project.git = true project.excludeFilters = [ "\\Wsbt-test\\W", "\\Winput_sources\\W", "\\Wcontraband-scala\\W" ] diff --git a/internal/util-collection/src/test/scala/SettingsTest.scala b/internal/util-collection/src/test/scala/SettingsTest.scala index b0bda5dc8..95083f225 100644 --- a/internal/util-collection/src/test/scala/SettingsTest.scala +++ b/internal/util-collection/src/test/scala/SettingsTest.scala @@ -135,8 +135,10 @@ object SettingsTest extends Properties("settings") { forAll(mkAttrKeys[Int](2)) { case List(key, derivedKey) => val projectKeys = for { proj <- 1 to nrProjects } yield ScopedKey(Scope(1, proj), key) - val projectDerivedKeys = for { proj <- 1 to nrProjects } yield - ScopedKey(Scope(1, proj), derivedKey) + val projectDerivedKeys = for { proj <- 1 to nrProjects } yield ScopedKey( + Scope(1, proj), + derivedKey + ) val globalKey = ScopedKey(Scope(0), key) val globalDerivedKey = ScopedKey(Scope(0), derivedKey) // Each project defines an initial value, but the update is defined in globalKey. diff --git a/main-actions/src/main/scala/sbt/Tests.scala b/main-actions/src/main/scala/sbt/Tests.scala index 876a39ccb..0c89b1dd0 100644 --- a/main-actions/src/main/scala/sbt/Tests.scala +++ b/main-actions/src/main/scala/sbt/Tests.scala @@ -442,8 +442,9 @@ object Tests { case _ => false }) // TODO: To pass in correct explicitlySpecified and selectors - val tests = for ((df, di) <- discovered; fingerprint <- toFingerprints(di)) - yield new TestDefinition(df.name, fingerprint, false, Array(new SuiteSelector)) + val tests = + for ((df, di) <- discovered; fingerprint <- toFingerprints(di)) + yield new TestDefinition(df.name, fingerprint, false, Array(new SuiteSelector)) val mains = discovered collect { case (df, di) if di.hasMain => df.name } (tests, mains.toSet) } diff --git a/main-actions/src/test/scala/sbt/CacheIvyTest.scala b/main-actions/src/test/scala/sbt/CacheIvyTest.scala index c1e741bed..17cb778e1 100644 --- a/main-actions/src/test/scala/sbt/CacheIvyTest.scala +++ b/main-actions/src/test/scala/sbt/CacheIvyTest.scala @@ -96,22 +96,21 @@ class CacheIvyTest extends Properties("CacheIvy") { inclusions <- Gen.listOf(arbitrary[InclExclRule]) extraAttributes <- Gen.mapOf(arbitrary[(String, String)]) crossVersion <- arbitrary[CrossVersion] - } yield - ModuleID( - organization = o, - name = n, - revision = r, - configurations = cs, - isChanging = isChanging, - isTransitive = isTransitive, - isForce = isForce, - explicitArtifacts = explicitArtifacts.toVector, - inclusions = inclusions.toVector, - exclusions = exclusions.toVector, - extraAttributes = extraAttributes, - crossVersion = crossVersion, - branchName = branch - ) + } yield ModuleID( + organization = o, + name = n, + revision = r, + configurations = cs, + isChanging = isChanging, + isTransitive = isTransitive, + isForce = isForce, + explicitArtifacts = explicitArtifacts.toVector, + inclusions = inclusions.toVector, + exclusions = exclusions.toVector, + extraAttributes = extraAttributes, + crossVersion = crossVersion, + branchName = branch + ) } property("moduleIDFormat") = forAll { (m: ModuleID) => diff --git a/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala b/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala index 44923a83a..8d9b32cb0 100644 --- a/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala +++ b/main-settings/src/test/scala/sbt/BuildSettingsInstances.scala @@ -70,10 +70,9 @@ object BuildSettingsInstances { 20 -> AttributeMap.empty, 1 -> { for (name <- Gen.identifier; isModule <- arbitrary[Boolean]) - yield - AttributeMap.empty - .put(AttributeKey[String]("name"), name) - .put(AttributeKey[Boolean]("isModule"), isModule) + yield AttributeMap.empty + .put(AttributeKey[String]("name"), name) + .put(AttributeKey[Boolean]("isModule"), isModule) } ) } diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index dd6fd1e89..5412ef666 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3024,12 +3024,11 @@ object Classpaths { val art = (artifact in packageBin).value val module = projectID.value val config = configuration.value - for { (f, analysis) <- trackedExportedProductsImplTask(track).value } yield - APIMappings - .store(analyzed(f, analysis), apiURL.value) - .put(artifact.key, art) - .put(moduleID.key, module) - .put(configuration.key, config) + for { (f, analysis) <- trackedExportedProductsImplTask(track).value } yield APIMappings + .store(analyzed(f, analysis), apiURL.value) + .put(artifact.key, art) + .put(moduleID.key, module) + .put(configuration.key, config) } private[sbt] def trackedExportedJarProducts(track: TrackLevel): Initialize[Task[Classpath]] = Def.task { @@ -3037,12 +3036,11 @@ object Classpaths { val art = (artifact in packageBin).value val module = projectID.value val config = configuration.value - for { (f, analysis) <- trackedJarProductsImplTask(track).value } yield - APIMappings - .store(analyzed(f, analysis), apiURL.value) - .put(artifact.key, art) - .put(moduleID.key, module) - .put(configuration.key, config) + for { (f, analysis) <- trackedJarProductsImplTask(track).value } yield APIMappings + .store(analyzed(f, analysis), apiURL.value) + .put(artifact.key, art) + .put(moduleID.key, module) + .put(configuration.key, config) } private[this] def trackedExportedProductsImplTask( track: TrackLevel diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index c0221798b..479984538 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -584,19 +584,18 @@ object BuiltinCommands { kvs = Act.keyValues(structure)(lastOnly_keys._2) f <- if (lastOnly_keys._1) success(() => s) else Aggregation.evaluatingParser(s, show)(kvs) - } yield - () => { - def export0(s: State): State = lastImpl(s, kvs, Some(ExportStream)) - val newS = try f() - catch { - case NonFatal(e) => - try export0(s) - finally { - throw e - } - } - export0(newS) + } yield () => { + def export0(s: State): State = lastImpl(s, kvs, Some(ExportStream)) + val newS = try f() + catch { + case NonFatal(e) => + try export0(s) + finally { + throw e + } } + export0(newS) + } } def lastGrepParser(s: State): Parser[(String, Option[AnyKeys])] = diff --git a/main/src/main/scala/sbt/Plugins.scala b/main/src/main/scala/sbt/Plugins.scala index 93666c953..0606506d5 100644 --- a/main/src/main/scala/sbt/Plugins.scala +++ b/main/src/main/scala/sbt/Plugins.scala @@ -267,8 +267,9 @@ object Plugins extends PluginsFunctions { private[this] def duplicateProvidesError(byAtom: Seq[(Atom, AutoPlugin)]): Unit = { val dupsByAtom = byAtom.groupBy(_._1).mapValues(_.map(_._2)) - val dupStrings = for ((atom, dups) <- dupsByAtom if dups.size > 1) - yield s"${atom.label} by ${dups.mkString(", ")}" + val dupStrings = + for ((atom, dups) <- dupsByAtom if dups.size > 1) + yield s"${atom.label} by ${dups.mkString(", ")}" val (ns, nl) = if (dupStrings.size > 1) ("s", "\n\t") else ("", " ") val message = s"Plugin$ns provided by multiple AutoPlugins:$nl${dupStrings.mkString(nl)}" throw AutoPluginException(message) diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala index 1da6ce938..982621665 100644 --- a/main/src/main/scala/sbt/internal/Act.scala +++ b/main/src/main/scala/sbt/internal/Act.scala @@ -89,15 +89,14 @@ object Act { def globalKey = for { g <- globalIdent - } yield - taskKeyExtra( - index, - defaultConfigs, - keyMap, - None, - ParsedZero, - ScopeMask(true, true, false, false) - ) + } yield taskKeyExtra( + index, + defaultConfigs, + keyMap, + None, + ParsedZero, + ScopeMask(true, true, false, false) + ) globalKey | fullKey } @@ -112,16 +111,15 @@ object Act { ): Seq[Parser[ParsedKey]] = for { conf <- configs(confAmb, defaultConfigs, proj, index) - } yield - for { - taskAmb <- taskAxis(index.tasks(proj, conf), keyMap) - task = resolveTask(taskAmb) - key <- key(index, proj, conf, task, keyMap) - extra <- extraAxis(keyMap, IMap.empty) - } yield { - val mask = baseMask.copy(task = taskAmb.isExplicit, extra = true) - new ParsedKey(makeScopedKey(proj, conf, task, extra, key), mask) - } + } yield for { + taskAmb <- taskAxis(index.tasks(proj, conf), keyMap) + task = resolveTask(taskAmb) + key <- key(index, proj, conf, task, keyMap) + extra <- extraAxis(keyMap, IMap.empty) + } yield { + val mask = baseMask.copy(task = taskAmb.isExplicit, extra = true) + new ParsedKey(makeScopedKey(proj, conf, task, extra, key), mask) + } def makeScopedKey( proj: Option[ResolvedReference], diff --git a/main/src/main/scala/sbt/internal/Aggregation.scala b/main/src/main/scala/sbt/internal/Aggregation.scala index 7ac58ba9e..cf6b19d44 100644 --- a/main/src/main/scala/sbt/internal/Aggregation.scala +++ b/main/src/main/scala/sbt/internal/Aggregation.scala @@ -195,8 +195,9 @@ object Aggregation { inputs: Values[InputTask[I]], show: ShowConfig )(implicit display: Show[ScopedKey[_]]): Parser[() => State] = { - val parsers = for (KeyValue(k, it) <- inputs) - yield it.parser(s).map(v => KeyValue(k, v)) + val parsers = + for (KeyValue(k, it) <- inputs) + yield it.parser(s).map(v => KeyValue(k, v)) Command.applyEffect(seq(parsers)) { roots => runTasks(s, roots, DummyTaskMap(Nil), show) } diff --git a/main/src/main/scala/sbt/internal/BuildLoader.scala b/main/src/main/scala/sbt/internal/BuildLoader.scala index 32ecca182..76c67addc 100644 --- a/main/src/main/scala/sbt/internal/BuildLoader.scala +++ b/main/src/main/scala/sbt/internal/BuildLoader.scala @@ -176,11 +176,10 @@ object BuildLoader { resolve <- cs.resolver(new ResolveInfo(uri, staging, config, state)) base = resolve() build <- cs.builder(new BuildInfo(uri, base, config, state)) - } yield - () => { - val unit = build() - cs.transformer(new TransformInfo(uri, base, unit, config, state)) - } + } yield () => { + val unit = build() + cs.transformer(new TransformInfo(uri, base, unit, config, state)) + } } } diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala index b19b7c750..40ec4cb1c 100644 --- a/main/src/main/scala/sbt/internal/SettingCompletions.scala +++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala @@ -149,8 +149,7 @@ private[sbt] object SettingCompletions { defineKey <- scopedKeyParser(keyMap, settings, context) a <- assign(defineKey) _ <- valueParser(defineKey, a) - } yield - () // parser is currently only for completion and the parsed data structures are not used + } yield () // parser is currently only for completion and the parsed data structures are not used matched(full) | any.+.string } diff --git a/main/src/test/scala/sbt/internal/TestBuild.scala b/main/src/test/scala/sbt/internal/TestBuild.scala index 36cbf1b75..b79141709 100644 --- a/main/src/test/scala/sbt/internal/TestBuild.scala +++ b/main/src/test/scala/sbt/internal/TestBuild.scala @@ -98,11 +98,10 @@ abstract class TestBuild { // task axis of Scope is set to Zero and the value of the second map is the original task axis val taskAxesMappings = for ((scope, keys) <- data.data.toIterable; key <- keys.keys) - yield - (ScopedKey(scope.copy(task = Zero), key), scope.task): ( - ScopedKey[_], - ScopeAxis[AttributeKey[_]] - ) + yield (ScopedKey(scope.copy(task = Zero), key), scope.task): ( + ScopedKey[_], + ScopeAxis[AttributeKey[_]] + ) val taskAxes = Relation.empty ++ taskAxesMappings val zero = new HashSet[ScopedKey[_]] @@ -369,8 +368,9 @@ abstract class TestBuild { names match { case Vector() => sequence(acc) case Vector(x, xs @ _*) => - val next = for (depCount <- maxDeps; d <- pick(depCount min xs.size, xs)) - yield (x, d.toVector) + val next = + for (depCount <- maxDeps; d <- pick(depCount min xs.size, xs)) + yield (x, d.toVector) genAcyclic(maxDeps, xs.toVector, next +: acc) } def sequence[T](gs: Vector[Gen[T]]): Gen[Vector[T]] = Gen.parameterized { prms => diff --git a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala index e4a744900..7dfc84776 100644 --- a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala +++ b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala @@ -112,40 +112,39 @@ class JUnitXmlTestsListener(val outputDir: String, logger: Logger) extends Tests {properties} { for (e <- events) - yield - selector.testName.split('.').last - case nested: NestedTestSelector => - nested.suiteId().split('.').last + "." + nested.testName() - case other => s"(It is not a test it is a ${other.getClass.getCanonicalName})" - } - } time={(e.duration() / 1000.0).toString}> - { - val trace: String = if (e.throwable.isDefined) { - val stringWriter = new StringWriter() - val writer = new PrintWriter(stringWriter) - e.throwable.get.printStackTrace(writer) - writer.flush() - stringWriter.toString - } else { - "" - } - e.status match { - case TStatus.Error if (e.throwable.isDefined) => - {trace} - case TStatus.Error => - case TStatus.Failure if (e.throwable.isDefined) => - {trace} - case TStatus.Failure => - case TStatus.Ignored | TStatus.Skipped | TStatus.Pending => - case _ => {} - } + yield selector.testName.split('.').last + case nested: NestedTestSelector => + nested.suiteId().split('.').last + "." + nested.testName() + case other => s"(It is not a test it is a ${other.getClass.getCanonicalName})" } + } time={(e.duration() / 1000.0).toString}> + { + val trace: String = if (e.throwable.isDefined) { + val stringWriter = new StringWriter() + val writer = new PrintWriter(stringWriter) + e.throwable.get.printStackTrace(writer) + writer.flush() + stringWriter.toString + } else { + "" + } + e.status match { + case TStatus.Error if (e.throwable.isDefined) => + {trace} + case TStatus.Error => + case TStatus.Failure if (e.throwable.isDefined) => + {trace} + case TStatus.Failure => + case TStatus.Ignored | TStatus.Skipped | TStatus.Pending => + case _ => {} + } + } }