Skip to content

Update scalafmt-core to 3.9.7 in 0.12.x #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2025
Merged

Update scalafmt-core to 3.9.7 in 0.12.x #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b589ce
Update scalafmt-core to 3.9.7 in 0.12.x
scala-steward Jun 10, 2025
57db10a
Reformat with scalafmt 3.9.7
scala-steward Jun 10, 2025
7d1ec83
Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs
scala-steward Jun 10, 2025
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.9.7
57db10a7468db8214022fc1337eb557d9f2ac0a9
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=3.7.17
version=3.9.7
runner.dialect=scala213source3
26 changes: 13 additions & 13 deletions src/main/scala/scalapb/json4s/JsonFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class Printer private (config: Printer.PrinterConfig) {
case PInt(v) => v.toString
case PLong(v) => v.toString
case PString(v) => v
case v =>
case v =>
throw new JsonFormatException(s"Unexpected value for key: $v")
}
val value = if (valueDescriptor.protoType.isTypeMessage) {
Expand Down Expand Up @@ -396,7 +396,7 @@ class Printer private (config: Printer.PrinterConfig) {
m.companion.asInstanceOf[GeneratedMessageCompanion[A]]
) match {
case Some(f) => f(this, m)
case None =>
case None =>
val b = List.newBuilder[JField]
val descriptor = m.companion.scalaDescriptor
b.sizeHint(descriptor.fields.size)
Expand Down Expand Up @@ -450,7 +450,7 @@ class Printer private (config: Printer.PrinterConfig) {
case PEnum(e) =>
config.formatRegistry.getEnumWriter(e.containingEnum) match {
case Some(writer) => writer(this, e)
case None =>
case None =>
if (config.isFormattingEnumsAsNumber || e.isUnrecognized)
JInt(e.number)
else JString(e.name)
Expand All @@ -460,11 +460,11 @@ class Printer private (config: Printer.PrinterConfig) {
case PInt(v) => JInt(v)
case PLong(v) => formatLong(v, fd.protoType, formattingLongAsNumber)
case PDouble(v) => JDouble(v)
case PFloat(v) =>
case PFloat(v) =>
if (!v.isNaN && !v.isInfinite) JDecimal(BigDecimal.decimal(v))
else JDouble(v)
case PBoolean(v) => JBool(v)
case PString(v) => JString(v)
case PBoolean(v) => JBool(v)
case PString(v) => JString(v)
case PByteString(v) =>
JString(Base64Variants.getDefaultVariant.encode(v.toByteArray))
case _: PMessage | PRepeated(_) | PEmpty =>
Expand Down Expand Up @@ -581,7 +581,7 @@ class Parser private (config: Parser.ParserConfig) {
case ScalaType.Int => PInt(java.lang.Integer.valueOf(key))
case ScalaType.Long => PLong(java.lang.Long.valueOf(key))
case ScalaType.String => PString(key)
case _ =>
case _ =>
throw new RuntimeException(
s"Unsupported type for key for ${fd.name}"
)
Expand Down Expand Up @@ -618,7 +618,7 @@ class Parser private (config: Parser.ParserConfig) {
cmp.asInstanceOf[GeneratedMessageCompanion[GeneratedMessage]]
) match {
case Some(p) => p(this, value).toPMessage
case None =>
case None =>
value match {
case JObject(fields) =>
val usedOneofs = mutable.Set[OneofDescriptor]()
Expand Down Expand Up @@ -987,7 +987,7 @@ object JsonFormat {
case (Type.TYPE_BOOL, JString("true")) => PBoolean(true)
case (Type.TYPE_BOOL, JString("false")) => PBoolean(false)
case (Type.TYPE_STRING, JString(s)) => PString(s)
case (Type.TYPE_BYTES, JString(s)) =>
case (Type.TYPE_BYTES, JString(s)) =>
PByteString(
ByteString.copyFrom(Base64Variants.getDefaultVariant.decode(s))
)
Expand Down Expand Up @@ -1072,7 +1072,7 @@ object JsonFormat {
case "NaN" => PDouble(Double.NaN)
case "Infinity" => PDouble(Double.PositiveInfinity)
case "-Infinity" => PDouble(Double.NegativeInfinity)
case v =>
case v =>
try {
val bd = new java.math.BigDecimal(v)
if (bd.compareTo(MAX_DOUBLE) > 0 || bd.compareTo(MIN_DOUBLE) < 0) {
Expand All @@ -1081,7 +1081,7 @@ object JsonFormat {
PDouble(bd.doubleValue)
} catch {
case e: JsonFormatException => throw e
case e: Exception =>
case e: Exception =>
throw new JsonFormatException("Not a double value: " + v)
}
}
Expand All @@ -1091,7 +1091,7 @@ object JsonFormat {
case "NaN" => PFloat(Float.NaN)
case "Infinity" => PFloat(Float.PositiveInfinity)
case "-Infinity" => PFloat(Float.NegativeInfinity)
case v =>
case v =>
try {
val value = java.lang.Double.parseDouble(v)
if (
Expand All @@ -1103,7 +1103,7 @@ object JsonFormat {
PFloat(value.toFloat)
} catch {
case e: JsonFormatException => throw e
case e: Exception =>
case e: Exception =>
throw new JsonFormatException("Not a float value: " + v)
}
}
Expand Down