From 5072c54624da74fed9d7cabf9db80eb775ef0a42 Mon Sep 17 00:00:00 2001 From: Nikita Gazarov Date: Mon, 18 Nov 2024 01:44:11 -0800 Subject: [PATCH] Build: Scalafmt - De-indent `extends` to get superclass constructor params at the right indent --- .scalafmt.conf | 4 ++-- .../com/raquo/airstream/core/AirstreamError.scala | 12 ++++++------ .../com/raquo/airstream/state/DerivedVarSignal.scala | 8 ++++---- .../com/raquo/airstream/state/ObservedSignal.scala | 8 ++++---- .../scala/com/raquo/airstream/web/FetchStream.scala | 6 +++--- .../com/raquo/airstream/web/WebStorageVar.scala | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 6b28b47c..dd061304 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -5,7 +5,6 @@ runner.dialect = "scala213" # - Maybe make a separate config for these files, that has two lines before method names, see https://scalameta.org/scalafmt/docs/configuration.html#fileoverride # - Does this exclusion actually work? IntelliJ seems to ignore it project.excludePaths = [ - "glob:**/src/main/scala/com/raquo/laminar/defs/**", "glob:**/project/VersionHelper.scala", "glob:**/src/*/scala-3/**" "glob:**/src/*/scala/com/raquo/airstream/combine/generated/**" @@ -22,7 +21,7 @@ indent.binPackDefnSite = 2 indent.ctorSite = 2 indent.matchSite = 2 indent.caseSite = 2 -indent.extendSite = 2 +indent.extendSite = 0 indent.withSiteRelativeToExtends = 0 indent.commaSiteRelativeToExtends = 2 # 0 is not allowed indent.extraBeforeOpenParenDefnSite = 0 @@ -78,6 +77,7 @@ newlines.afterInfix = keep newlines.afterInfixBreakOnNested = false # ??? https://scalameta.org/scalafmt/docs/configuration.html#newlinesafterinfixbreakonnested newlines.avoidForSimpleOverflow = [tooLong, punct, slc] newlines.avoidInResultType = true +newlines.avoidAfterYield = false newlines.sometimesBeforeColonInMethodReturnType = false # newlines.beforeOpenParenDefnSite = keep # TODO not sure https://scalameta.org/scalafmt/docs/configuration.html#newlinesbeforeopenparenxxxsite # newlines.beforeOpenParenCallSite = keep # TODO only supported for Scala 3. Also, not sure... https://scalameta.org/scalafmt/docs/configuration.html#newlinesbeforeopenparenxxxsite diff --git a/src/main/scala/com/raquo/airstream/core/AirstreamError.scala b/src/main/scala/com/raquo/airstream/core/AirstreamError.scala index 15c7f617..9148252a 100644 --- a/src/main/scala/com/raquo/airstream/core/AirstreamError.scala +++ b/src/main/scala/com/raquo/airstream/core/AirstreamError.scala @@ -35,7 +35,7 @@ object AirstreamError { } case class VarError(message: String, cause: Option[Throwable]) - extends AirstreamError(s"$message; cause: ${cause.map(getFullMessage)}") { + extends AirstreamError(s"$message; cause: ${cause.map(getFullMessage)}") { cause.foreach(initCause) @@ -43,7 +43,7 @@ object AirstreamError { } case class ErrorHandlingError(error: Throwable, cause: Throwable) - extends AirstreamError(s"ErrorHandlingError: ${getFullMessage(error)}; cause: ${getFullMessage(cause)}") { + extends AirstreamError(s"ErrorHandlingError: ${getFullMessage(error)}; cause: ${getFullMessage(cause)}") { initCause(cause) @@ -51,7 +51,7 @@ object AirstreamError { } case class CombinedError(causes: Seq[Option[Throwable]]) - extends AirstreamError(s"CombinedError: ${causes.flatten.map(getFullMessage).mkString("; ")}") { + extends AirstreamError(s"CombinedError: ${causes.flatten.map(getFullMessage).mkString("; ")}") { causes.flatten.headOption.foreach(initCause) // Just get the first cause – better than nothing I guess? @@ -64,7 +64,7 @@ object AirstreamError { } case class ObserverErrorHandlingError(error: Throwable, cause: Throwable) - extends AirstreamError(s"ObserverErrorHandlingError: ${getFullMessage(error)}; cause: ${getFullMessage(cause)}") { + extends AirstreamError(s"ObserverErrorHandlingError: ${getFullMessage(error)}; cause: ${getFullMessage(cause)}") { initCause(cause) @@ -72,13 +72,13 @@ object AirstreamError { } case class DebugError(error: Throwable, cause: Option[Throwable]) - extends AirstreamError(s"DebugError: ${getFullMessage(error)}; cause: ${cause.map(getFullMessage)}") { + extends AirstreamError(s"DebugError: ${getFullMessage(error)}; cause: ${cause.map(getFullMessage)}") { override def toString: String = s"DebugError: $error; cause: $cause" } case class TransactionDepthExceeded(trx: Transaction, depth: Int) - extends AirstreamError(s"Transaction depth exceeded maxDepth = $depth: Execution of $trx aborted. See `Transaction.maxDepth`.") { + extends AirstreamError(s"Transaction depth exceeded maxDepth = $depth: Execution of $trx aborted. See `Transaction.maxDepth`.") { override def toString: String = s"TransactionDepthExceeded: $trx; maxDepth: $depth" } diff --git a/src/main/scala/com/raquo/airstream/state/DerivedVarSignal.scala b/src/main/scala/com/raquo/airstream/state/DerivedVarSignal.scala index 3d96bbd4..fe253a12 100644 --- a/src/main/scala/com/raquo/airstream/state/DerivedVarSignal.scala +++ b/src/main/scala/com/raquo/airstream/state/DerivedVarSignal.scala @@ -10,10 +10,10 @@ class DerivedVarSignal[A, B]( owner: Owner, parentDisplayName: => String ) extends MapSignal[A, B]( - parent.signal, - project = zoomIn, - recover = None - ) with OwnedSignal[B] { + parent.signal, + project = zoomIn, + recover = None +) with OwnedSignal[B] { // Note that even if owner kills subscription, this signal might remain due to other listeners override protected[state] def isStarted: Boolean = super.isStarted diff --git a/src/main/scala/com/raquo/airstream/state/ObservedSignal.scala b/src/main/scala/com/raquo/airstream/state/ObservedSignal.scala index 28a98f99..afcbb5b4 100644 --- a/src/main/scala/com/raquo/airstream/state/ObservedSignal.scala +++ b/src/main/scala/com/raquo/airstream/state/ObservedSignal.scala @@ -13,10 +13,10 @@ class ObservedSignal[A]( observer: Observer[A], owner: Owner ) extends MapSignal[A, A]( - parent, - project = identity, - recover = None - ) with OwnedSignal[A] { + parent, + project = identity, + recover = None +) with OwnedSignal[A] { override protected[this] val subscription: Subscription = addObserver(observer)(owner) diff --git a/src/main/scala/com/raquo/airstream/web/FetchStream.scala b/src/main/scala/com/raquo/airstream/web/FetchStream.scala index 186fedd6..f2465a0c 100644 --- a/src/main/scala/com/raquo/airstream/web/FetchStream.scala +++ b/src/main/scala/com/raquo/airstream/web/FetchStream.scala @@ -9,9 +9,9 @@ import scala.scalajs.js * and some other Javascript-specific data types. */ object FetchStream extends FetchBuilder[dom.BodyInit, String]( - encodeRequest = identity, - decodeResponse = response => EventStream.fromJsPromise(response.text()) - ) { + encodeRequest = identity, + decodeResponse = response => EventStream.fromJsPromise(response.text()) +) { lazy val raw: FetchBuilder[dom.BodyInit, dom.Response] = { new FetchBuilder(identity, EventStream.fromValue(_)) diff --git a/src/main/scala/com/raquo/airstream/web/WebStorageVar.scala b/src/main/scala/com/raquo/airstream/web/WebStorageVar.scala index 9639b698..2f57fc28 100644 --- a/src/main/scala/com/raquo/airstream/web/WebStorageVar.scala +++ b/src/main/scala/com/raquo/airstream/web/WebStorageVar.scala @@ -44,8 +44,8 @@ class WebStorageVar[A] private[web] ( default: => Try[A], syncDistinctByFn: (A, A) => Boolean ) extends SourceVar[A]( - initial = maybeStorage().flatMap(s => Option(s.getItem(key)).map(decode)).getOrElse(default) - ) { + initial = maybeStorage().flatMap(s => Option(s.getItem(key)).map(decode)).getOrElse(default) +) { private[web] val owner = new ManualOwner