From 4b745d96721af19a77ebf3067f34000708efd4a4 Mon Sep 17 00:00:00 2001 From: He-Pin Date: Tue, 28 Jul 2026 11:02:41 +0800 Subject: [PATCH] chore: bump scalafmt to 3.11.5 Motivation: Pick up upstream scalafmt bug fixes and Scala 3 formatting improvements shipped between 3.9.10 and 3.11.5. Modification: Update the pinned version in .scalafmt.conf and apply the only formatting delta produced by the new version (a block comment alignment in Parser.scala). Result: `./mill __.reformat` and `./mill __.checkFormat` pass on all 36 modules; JVM compile across 2.12/2.13/3.3 is green. --- .scalafmt.conf | 2 +- sjsonnet/src/sjsonnet/Parser.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 95c371cae..77d1f0682 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.9.10" +version = "3.11.5" docstrings.style = Asterisk maxColumn = 100 diff --git a/sjsonnet/src/sjsonnet/Parser.scala b/sjsonnet/src/sjsonnet/Parser.scala index 1b74facc5..f3de31957 100644 --- a/sjsonnet/src/sjsonnet/Parser.scala +++ b/sjsonnet/src/sjsonnet/Parser.scala @@ -903,7 +903,7 @@ class Parser( /* * Prevent duplicate fields in list comprehension. See: https://github.com/databricks/sjsonnet/issues/99 * - * If comps._1 is a forspec with value greater than one lhs cannot be a Expr.Str + * If comps._1 is a forspec with value greater than one lhs cannot be a Expr.Str * Otherwise the field value will be overriden by the multiple iterations of forspec */ (lhs, comps) match {