Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.8.1
c782b48485ca4a5c1899d453732d5935d731bc72

# Scala Steward: Reformat with scalafmt 3.8.6
eb0120cd2d0f46c1fb263c56bfa4a46003bf2c06
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.1
version = 3.8.6
maxColumn = 120
align.preset = most
rewrite.rules = [RedundantBraces]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading