diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 053292f..a31dfa6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.8.1 c782b48485ca4a5c1899d453732d5935d731bc72 + +# Scala Steward: Reformat with scalafmt 3.8.6 +eb0120cd2d0f46c1fb263c56bfa4a46003bf2c06 diff --git a/.scalafmt.conf b/.scalafmt.conf index ca9f547..b386168 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.6 maxColumn = 120 align.preset = most rewrite.rules = [RedundantBraces] diff --git a/benchmarks/src/main/scala/zio/parser/benchmarks/json/JsonParserz.scala b/benchmarks/src/main/scala/zio/parser/benchmarks/json/JsonParserz.scala index afbcabe..5f6275f 100644 --- a/benchmarks/src/main/scala/zio/parser/benchmarks/json/JsonParserz.scala +++ b/benchmarks/src/main/scala/zio/parser/benchmarks/json/JsonParserz.scala @@ -79,10 +79,13 @@ object JsonParserz { val field: G[(String, Json)] = (string <~ (':', colon)) ~ js val obj: G[Json.Obj] = - ((brace1, '{') ~> field.separated(comma).map(_.values, { _: List[(String, Json)] => ??? }) <~ (( - (), - '}' - ), spacing ~ brace2)).map( + ((brace1, '{') ~> field.separated(comma).map(_.values, { _: List[(String, Json)] => ??? }) <~ ( + ( + (), + '}' + ), + spacing ~ brace2 + )).map( lst => Json.Obj(Chunk.fromIterable(lst)), obj => obj.fields.toList ) diff --git a/build.sbt b/build.sbt index 0f5448b..a98930b 100644 --- a/build.sbt +++ b/build.sbt @@ -144,7 +144,7 @@ lazy val zioParserJS = zioParser.js .settings( scalaJSUseMainModuleInitializer := true, libraryDependencies ++= Seq( - ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).cross(CrossVersion.for3Use2_13) + ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).cross(CrossVersion.for3Use2_13) ) ) lazy val zioParserNative = zioParser.native diff --git a/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala b/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala index 6905133..56af69d 100644 --- a/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala +++ b/zio-parser/shared/src/test/scala/zio/parser/examples/BashPrettyPrinterExample.scala @@ -1005,30 +1005,30 @@ object BashPrettyPrinterExample extends ZIOSpecDefault { sealed trait BashArithmeticExpression object BashArithmeticExpressions { - case class Number(value: Int) extends BashArithmeticExpression // n - case class Variable(variable: BashVariable) extends BashArithmeticExpression // $X - case class PostIncrement(x: BashArithmeticExpression) extends BashArithmeticExpression // x++ - case class PostDecrement(x: BashArithmeticExpression) extends BashArithmeticExpression // x-- - case class PreIncrement(x: BashArithmeticExpression) extends BashArithmeticExpression // ++x - case class PreDecrement(x: BashArithmeticExpression) extends BashArithmeticExpression // --x - case class Minus(x: BashArithmeticExpression) extends BashArithmeticExpression // -x - case class Plus(x: BashArithmeticExpression) extends BashArithmeticExpression // +x - case class LogicalNot(x: BashArithmeticExpression) extends BashArithmeticExpression // !x - case class BitwiseNot(x: BashArithmeticExpression) extends BashArithmeticExpression // ~x + case class Number(value: Int) extends BashArithmeticExpression // n + case class Variable(variable: BashVariable) extends BashArithmeticExpression // $X + case class PostIncrement(x: BashArithmeticExpression) extends BashArithmeticExpression // x++ + case class PostDecrement(x: BashArithmeticExpression) extends BashArithmeticExpression // x-- + case class PreIncrement(x: BashArithmeticExpression) extends BashArithmeticExpression // ++x + case class PreDecrement(x: BashArithmeticExpression) extends BashArithmeticExpression // --x + case class Minus(x: BashArithmeticExpression) extends BashArithmeticExpression // -x + case class Plus(x: BashArithmeticExpression) extends BashArithmeticExpression // +x + case class LogicalNot(x: BashArithmeticExpression) extends BashArithmeticExpression // !x + case class BitwiseNot(x: BashArithmeticExpression) extends BashArithmeticExpression // ~x case class Exponentiation(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x ** y - case class Add(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x + y - case class Sub(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x - y - case class Mul(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x * y - case class Div(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x / y - case class Rem(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x % y + case class Add(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x + y + case class Sub(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x - y + case class Mul(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x * y + case class Div(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x / y + case class Rem(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x % y case class BitwiseLeftShift(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x << y case class BitwiseRightShift(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x >> y case class LessEq(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x <= y - case class Less(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x < y + case class Less(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x < y case class Greater(x: BashArithmeticExpression, y: BashArithmeticExpression) extends BashArithmeticExpression // x > y case class GreaterEq(x: BashArithmeticExpression, y: BashArithmeticExpression) @@ -1052,13 +1052,13 @@ object BashPrettyPrinterExample extends ZIOSpecDefault { trueCase: BashArithmeticExpression, falseCase: BashArithmeticExpression ) extends BashArithmeticExpression // condition ? trueCase : falseCase - case class Assign(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x = y - case class AssignMul(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x *= y - case class AssignDiv(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x /= y - case class AssignRem(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x %= y - case class AssignAdd(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x += y - case class AssignSub(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x -= y - case class AssignShiftLeft(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x <<= y + case class Assign(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x = y + case class AssignMul(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x *= y + case class AssignDiv(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x /= y + case class AssignRem(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x %= y + case class AssignAdd(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x += y + case class AssignSub(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x -= y + case class AssignShiftLeft(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x <<= y case class AssignShiftRight(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x >>= y case class AssignAnd(x: BashVariable, y: BashArithmeticExpression) extends BashArithmeticExpression // x &= y