From 2ac7501c7ce2ad5f536af67100704f3395c5ae33 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 20 Apr 2019 23:20:19 -0400 Subject: [PATCH 1/2] sbt-scalafmt 2.0.0 --- .scalafmt.conf | 5 ++++- .travis.yml | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e4ab36511..5b87db3b7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,6 +1,7 @@ +version = 2.0.0-RC5 maxColumn = 100 project.git = true -project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ] +project.excludeFilters = [ "\\Wsbt-test\\W", "\\Winput_sources\\W", "\\Wcontraband-scala\\W" ] # http://docs.scala-lang.org/style/scaladoc.html recommends the JavaDoc style. # scala/scala is written that way too https://github.com/scala/scala/blob/v2.12.2/src/library/scala/Predef.scala @@ -8,3 +9,5 @@ docstrings = JavaDoc # This also seems more idiomatic to include whitespace in import x.{ yyy } spaces.inImportCurlyBraces = true + +trailingCommas = preserve diff --git a/.travis.yml b/.travis.yml index 3233c1a4c..d6dc44b30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ scala: script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues - scalafmtCheck + scalafmtCheckAll whitesourceCheckPolicies test diff --git a/project/build.properties b/project/build.properties index 0cd8b0798..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.3 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8e37e2155..70d7318b3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9") -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1") addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4") From 98ec0075f4c4b9367e1acfc2682d48d9d032d34b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 20 Apr 2019 23:23:13 -0400 Subject: [PATCH 2/2] apply formatting --- .../sbt/internal/util/ErrorHandling.scala | 12 +++- .../sbt/internal/util/BufferedLogger.scala | 24 +++++-- .../sbt/internal/util/ConsoleAppender.scala | 6 +- .../sbt/internal/util/ManagedLogger.scala | 6 +- .../main/scala/sbt/util/InterfaceUtil.scala | 68 ++++++++++--------- .../sbt/internal/scripted/ScriptRunner.scala | 8 ++- .../sbt/internal/scripted/ScriptedTests.scala | 29 ++++---- .../src/main/scala/sbt/util/Cache.scala | 2 +- .../main/scala/sbt/util/FileFunction.scala | 17 +++-- 9 files changed, 105 insertions(+), 67 deletions(-) diff --git a/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala b/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala index f9b101453..e0e90a6d7 100644 --- a/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala +++ b/internal/util-control/src/main/scala/sbt/internal/util/ErrorHandling.scala @@ -7,20 +7,26 @@ import java.io.IOException object ErrorHandling { def translate[T](msg: => String)(f: => T) = - try { f } catch { + try { + f + } catch { case e: IOException => throw new TranslatedIOException(msg + e.toString, e) case e: Exception => throw new TranslatedException(msg + e.toString, e) } def wideConvert[T](f: => T): Either[Throwable, T] = - try { Right(f) } catch { + try { + Right(f) + } catch { case ex @ (_: Exception | _: StackOverflowError) => Left(ex) case err @ (_: ThreadDeath | _: VirtualMachineError) => throw err case x: Throwable => Left(x) } def convert[T](f: => T): Either[Exception, T] = - try { Right(f) } catch { case e: Exception => Left(e) } + try { + Right(f) + } catch { case e: Exception => Left(e) } def reducedToString(e: Throwable): String = if (e.getClass == classOf[RuntimeException]) { diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala index dc22049c0..ae5cb789a 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala @@ -50,7 +50,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append def record() = synchronized { recording = true } def buffer[T](f: => T): T = { record() - try { f } finally { stopQuietly() } + try { + f + } finally { + stopQuietly() + } } def bufferQuietly[T](f: => T): T = { record() @@ -60,7 +64,11 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stopBuffer() } catch { case _: Exception => () } } + def stopQuietly() = synchronized { + try { + stopBuffer() + } catch { case _: Exception => () } + } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate @@ -99,7 +107,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger { def record() = synchronized { recording = true } def buffer[T](f: => T): T = { record() - try { f } finally { stopQuietly() } + try { + f + } finally { + stopQuietly() + } } def bufferQuietly[T](f: => T): T = { record() @@ -109,7 +121,11 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger { result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stop() } catch { case _: Exception => () } } + def stopQuietly() = synchronized { + try { + stop() + } catch { case _: Exception => () } + } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index 741bafc4f..6cd21e55c 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -438,7 +438,8 @@ class ConsoleAppender private[ConsoleAppender] ( out.lockObject.synchronized { message.linesIterator.foreach { line => val builder = new java.lang.StringBuilder( - labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3) + labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3 + ) def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset) builder.append(reset).append('[') fmted(labelColor, label) @@ -468,7 +469,8 @@ class ConsoleAppender private[ConsoleAppender] ( s"$ScrollUp$DeleteLine$msg${CursorLeft1000}" + ( if (scrollNum <= 1) "" else scrollUp(scrollNum - 1) - )) + ) + ) out.flush() } else { out.println(msg) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala index 3add4cd04..b883c43d1 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala @@ -28,8 +28,10 @@ class ManagedLogger( private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent] // send special event for success since it's not a real log level override def success(message: => String): Unit = { - infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]], - SuccessEventTag) + infoEvent[SuccessEvent](SuccessEvent(message))( + implicitly[JsonFormat[SuccessEvent]], + SuccessEventTag + ) } def registerStringCodec[A: ShowLines: TypeTag]: Unit = { diff --git a/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala b/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala index 1de667f5b..0b1f5bf8c 100644 --- a/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala +++ b/internal/util-logging/src/main/scala/sbt/util/InterfaceUtil.scala @@ -46,19 +46,21 @@ object InterfaceUtil { sourcePath0: Option[String], sourceFile0: Option[File] ): Position = - position(line0, - content, - offset0, - pointer0, - pointerSpace0, - sourcePath0, - sourceFile0, - None, - None, - None, - None, - None, - None) + position( + line0, + content, + offset0, + pointer0, + pointerSpace0, + sourcePath0, + sourceFile0, + None, + None, + None, + None, + None, + None + ) def position( line0: Option[Integer], @@ -75,29 +77,33 @@ object InterfaceUtil { endLine0: Option[Integer], endColumn0: Option[Integer] ): Position = - new ConcretePosition(line0, - content, - offset0, - pointer0, - pointerSpace0, - sourcePath0, - sourceFile0, - startOffset0, - endOffset0, - startLine0, - startColumn0, - endLine0, - endColumn0) + new ConcretePosition( + line0, + content, + offset0, + pointer0, + pointerSpace0, + sourcePath0, + sourceFile0, + startOffset0, + endOffset0, + startLine0, + startColumn0, + endLine0, + endColumn0 + ) @deprecated("Use the overload of this method with more arguments", "1.2.2") def problem(cat: String, pos: Position, msg: String, sev: Severity): Problem = problem(cat, pos, msg, sev, None) - def problem(cat: String, - pos: Position, - msg: String, - sev: Severity, - rendered: Option[String]): Problem = + def problem( + cat: String, + pos: Position, + msg: String, + sev: Severity, + rendered: Option[String] + ): Problem = new ConcreteProblem(cat, pos, msg, sev, rendered) private final class ConcreteT2[A1, A2](a1: A1, a2: A2) extends T2[A1, A2] { diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala index a15458dc4..e92de6e39 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptRunner.scala @@ -15,7 +15,9 @@ class ScriptRunner { def processStatement(handler: StatementHandler, statement: Statement): Unit = { val state = states(handler).asInstanceOf[handler.State] val nextState = - try { Right(handler(statement.command, statement.arguments, state)) } catch { + try { + Right(handler(statement.command, statement.arguments, state)) + } catch { case e: Exception => Left(e) } nextState match { @@ -42,7 +44,9 @@ class ScriptRunner { statements foreach (Function.tupled(processStatement)) } finally { for (handler <- handlers; state <- states.get(handler)) { - try { handler.finish(state.asInstanceOf[handler.State]) } catch { case e: Exception => () } + try { + handler.finish(state.asInstanceOf[handler.State]) + } catch { case e: Exception => () } } } } diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala index e88d4bb16..eec88b150 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala @@ -75,21 +75,22 @@ final class ScriptedTests( val g = groupDir.getName val n = nme.getName val str = s"$g / $n" - () => - { - println("Running " + str) - testResources.readWriteResourceDirectory(g, n) { testDirectory => - val disabled = new File(testDirectory, "disabled").isFile - if (disabled) { - log.info("D " + str + " [DISABLED]") - None - } else { - try { scriptedTest(str, testDirectory, prescripted, log); None } catch { - case _: TestException | _: PendingTestSuccessException => Some(str) - } + () => { + println("Running " + str) + testResources.readWriteResourceDirectory(g, n) { testDirectory => + val disabled = new File(testDirectory, "disabled").isFile + if (disabled) { + log.info("D " + str + " [DISABLED]") + None + } else { + try { + scriptedTest(str, testDirectory, prescripted, log); None + } catch { + case _: TestException | _: PendingTestSuccessException => Some(str) } } } + } } } @@ -149,7 +150,9 @@ final class ScriptedTests( case e: Exception => testFailed() if (!pending) throw e - } finally { buffered.clearBuffer() } + } finally { + buffered.clearBuffer() + } } } diff --git a/util-cache/src/main/scala/sbt/util/Cache.scala b/util-cache/src/main/scala/sbt/util/Cache.scala index 8e4a4a7de..d0b03033d 100644 --- a/util-cache/src/main/scala/sbt/util/Cache.scala +++ b/util-cache/src/main/scala/sbt/util/Cache.scala @@ -60,7 +60,7 @@ object Cache { val result = default(key) update(result) result - } + } def debug[I](label: String, cache: SingletonCache[I]): SingletonCache[I] = new SingletonCache[I] { diff --git a/util-tracking/src/main/scala/sbt/util/FileFunction.scala b/util-tracking/src/main/scala/sbt/util/FileFunction.scala index 0aa58ca4c..1a7e033ef 100644 --- a/util-tracking/src/main/scala/sbt/util/FileFunction.scala +++ b/util-tracking/src/main/scala/sbt/util/FileFunction.scala @@ -137,16 +137,15 @@ object FileFunction { ): Set[File] => Set[File] = { lazy val inCache = Difference.inputs(storeFactory.make("in-cache"), inStyle) lazy val outCache = Difference.outputs(storeFactory.make("out-cache"), outStyle) - inputs => - { - inCache(inputs) { inReport => - outCache { outReport => - if (inReport.modified.isEmpty && outReport.modified.isEmpty) - outReport.checked - else - action(inReport, outReport) - } + inputs => { + inCache(inputs) { inReport => + outCache { outReport => + if (inReport.modified.isEmpty && outReport.modified.isEmpty) + outReport.checked + else + action(inReport, outReport) } } + } } }