Update scalafmt-core to 3.8.2 (#151)

* Update scalafmt-core to 3.8.2 * Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
ekrich · Jun 18, 2024 · 0468d4f · 0468d4f
1 parent 67bc97a
commit 0468d4f
Show file tree

Hide file tree

Showing 18 changed files with 236 additions and 66 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,4 @@
 # ekrich: initial format with scalafmt 3.8.0
-ba889eb2ab48b85a7543cb97046511807e9f7b6e
+ba889eb2ab48b85a7543cb97046511807e9f7b6e
+# Scala Steward: Reformat with scalafmt 3.8.2
+2f25ac3523d6f3efa1b1e00b1fcd3ce231ca82e1
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -3,7 +3,7 @@
 # settings is preferred over adding especially as
 # the Scala language evolves and styles change.
 # Test upgrades: $ scripts/scalafmt --test 2> diff.txt
-version = 3.8.1
+version = 3.8.2
 docstrings.style = AsteriskSpace
 project.git = true
 project.excludePaths = [

diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,8 @@ inThisBuild(
         homepage := Some(url("https://github.com/ekrich/sjavatime")),
         licenses := List(
             "BSD 3-Clause" ->
-              url("https://github.com/ekrich/sjavatime/blob/master/LICENSE.txt")),
+              url("https://github.com/ekrich/sjavatime/blob/master/LICENSE.txt")
+        ),
         developers := List(
             // for this fork
             Developer(id = "ekrich",

diff --git a/sjavatime/shared/src/main/scala-3/java/time/temporal/ChronoField.scala b/sjavatime/shared/src/main/scala-3/java/time/temporal/ChronoField.scala
@@ -13,93 +13,209 @@ enum ChronoField(_range: ValueRange, baseUnit: ChronoUnit,
   //   private final val isDateBasedFlag = 2
 
   case NANO_OF_SECOND extends ChronoField(
-          ValueRange.of(0, 999999999), NANOS, SECONDS, 1)
+          ValueRange.of(0, 999999999),
+          NANOS,
+          SECONDS,
+          1
+      )
 
   case NANO_OF_DAY extends ChronoField(
-          ValueRange.of(0, 86399999999999L), NANOS, DAYS, 1)
+          ValueRange.of(0, 86399999999999L),
+          NANOS,
+          DAYS,
+          1
+      )
 
   case MICRO_OF_SECOND extends ChronoField(
-          ValueRange.of(0, 999999), MICROS, SECONDS, 1)
+          ValueRange.of(0, 999999),
+          MICROS,
+          SECONDS,
+          1
+      )
 
   case MICRO_OF_DAY extends ChronoField(
-          ValueRange.of(0, 86399999999L), MICROS, DAYS, 1)
+          ValueRange.of(0, 86399999999L),
+          MICROS,
+          DAYS,
+          1
+      )
 
   case MILLI_OF_SECOND extends ChronoField(
-          ValueRange.of(0, 999), MILLIS, SECONDS, 1)
+          ValueRange.of(0, 999),
+          MILLIS,
+          SECONDS,
+          1
+      )
 
   case MILLI_OF_DAY extends ChronoField(
-          ValueRange.of(0, 86399999), MILLIS, DAYS, 1)
+          ValueRange.of(0, 86399999),
+          MILLIS,
+          DAYS,
+          1
+      )
 
   case SECOND_OF_MINUTE extends ChronoField(
-          ValueRange.of(0, 59), SECONDS, MINUTES, 1)
+          ValueRange.of(0, 59),
+          SECONDS,
+          MINUTES,
+          1
+      )
 
   case SECOND_OF_DAY extends ChronoField(
-          ValueRange.of(0, 86399), SECONDS, DAYS, 1)
+          ValueRange.of(0, 86399),
+          SECONDS,
+          DAYS,
+          1
+      )
 
   case MINUTE_OF_HOUR extends ChronoField(
-          ValueRange.of(0, 59), MINUTES, HOURS, 1)
+          ValueRange.of(0, 59),
+          MINUTES,
+          HOURS,
+          1
+      )
 
   case MINUTE_OF_DAY extends ChronoField(
-          ValueRange.of(0, 1439), MINUTES, DAYS, 1)
+          ValueRange.of(0, 1439),
+          MINUTES,
+          DAYS,
+          1
+      )
 
   case HOUR_OF_AMPM extends ChronoField(
-          ValueRange.of(0, 11), HOURS, HALF_DAYS, 1)
+          ValueRange.of(0, 11),
+          HOURS,
+          HALF_DAYS,
+          1
+      )
 
   case CLOCK_HOUR_OF_AMPM extends ChronoField(
-          ValueRange.of(1, 12), HOURS, HALF_DAYS, 1)
+          ValueRange.of(1, 12),
+          HOURS,
+          HALF_DAYS,
+          1
+      )
 
   case HOUR_OF_DAY extends ChronoField(
-          ValueRange.of(0, 23), HOURS, DAYS, 1)
+          ValueRange.of(0, 23),
+          HOURS,
+          DAYS,
+          1
+      )
 
   case CLOCK_HOUR_OF_DAY extends ChronoField(
-          ValueRange.of(1, 24), HOURS, DAYS, 1)
+          ValueRange.of(1, 24),
+          HOURS,
+          DAYS,
+          1
+      )
 
   case AMPM_OF_DAY extends ChronoField(
-          ValueRange.of(0, 1), HALF_DAYS, DAYS, 1)
+          ValueRange.of(0, 1),
+          HALF_DAYS,
+          DAYS,
+          1
+      )
 
   case DAY_OF_WEEK extends ChronoField(
-          ValueRange.of(1, 7), DAYS, WEEKS, 2)
+          ValueRange.of(1, 7),
+          DAYS,
+          WEEKS,
+          2
+      )
 
   case ALIGNED_DAY_OF_WEEK_IN_MONTH extends ChronoField(
-          ValueRange.of(1, 7), DAYS, WEEKS, 2)
+          ValueRange.of(1, 7),
+          DAYS,
+          WEEKS,
+          2
+      )
 
   case ALIGNED_DAY_OF_WEEK_IN_YEAR extends ChronoField(
-          ValueRange.of(1, 7), DAYS, WEEKS, 2)
+          ValueRange.of(1, 7),
+          DAYS,
+          WEEKS,
+          2
+      )
 
   case DAY_OF_MONTH extends ChronoField(
-          ValueRange.of(1, 28, 31), DAYS, MONTHS, 2)
+          ValueRange.of(1, 28, 31),
+          DAYS,
+          MONTHS,
+          2
+      )
 
   case DAY_OF_YEAR extends ChronoField(
-          ValueRange.of(1, 365, 366), DAYS, YEARS, 2)
+          ValueRange.of(1, 365, 366),
+          DAYS,
+          YEARS,
+          2
+      )
 
   case EPOCH_DAY extends ChronoField(
-          ValueRange.of(-365249999634L, 365249999634L), DAYS, FOREVER, 2)
+          ValueRange.of(-365249999634L, 365249999634L),
+          DAYS,
+          FOREVER,
+          2
+      )
 
   case ALIGNED_WEEK_OF_MONTH extends ChronoField(
-          ValueRange.of(1, 4, 5), WEEKS, MONTHS, 2)
+          ValueRange.of(1, 4, 5),
+          WEEKS,
+          MONTHS,
+          2
+      )
 
   case ALIGNED_WEEK_OF_YEAR extends ChronoField(
-          ValueRange.of(1, 53), WEEKS, YEARS, 2)
+          ValueRange.of(1, 53),
+          WEEKS,
+          YEARS,
+          2
+      )
 
   case MONTH_OF_YEAR extends ChronoField(
-          ValueRange.of(1, 12), MONTHS, YEARS, 2)
+          ValueRange.of(1, 12),
+          MONTHS,
+          YEARS,
+          2
+      )
 
   case PROLEPTIC_MONTH extends ChronoField(
-          ValueRange.of(-11999999988L, 11999999999L), MONTHS, FOREVER, 2)
+          ValueRange.of(-11999999988L, 11999999999L),
+          MONTHS,
+          FOREVER,
+          2
+      )
 
   case YEAR_OF_ERA extends ChronoField(
-          ValueRange.of(1, 999999999, 1000000000), YEARS, ERAS, 2)
+          ValueRange.of(1, 999999999, 1000000000),
+          YEARS,
+          ERAS,
+          2
+      )
 
   case YEAR extends ChronoField(
-          ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE), YEARS, FOREVER, 2)
+          ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE),
+          YEARS,
+          FOREVER,
+          2
+      )
 
   case ERA extends ChronoField(ValueRange.of(0, 1), ERAS, FOREVER, 2)
 
   case INSTANT_SECONDS extends ChronoField(
-          ValueRange.of(Long.MinValue, Long.MaxValue), SECONDS, FOREVER, 0)
+          ValueRange.of(Long.MinValue, Long.MaxValue),
+          SECONDS,
+          FOREVER,
+          0
+      )
 
   case OFFSET_SECONDS extends ChronoField(
-          ValueRange.of(-64800, 64800), SECONDS, FOREVER, 0)
+          ValueRange.of(-64800, 64800),
+          SECONDS,
+          FOREVER,
+          0
+      )
 
   // Not implemented:
   // def String getDisplayName(locale: java.util.Locale)

diff --git a/sjavatime/shared/src/main/scala-3/java/time/temporal/ChronoUnit.scala b/sjavatime/shared/src/main/scala-3/java/time/temporal/ChronoUnit.scala
@@ -30,16 +30,24 @@ enum ChronoUnit(duration: Duration,
   case YEARS extends ChronoUnit(Duration.OneYear, ChronoUnit.isDateBasedFlag)
 
   case DECADES extends ChronoUnit(
-          Duration.OneYear.multipliedBy(10), ChronoUnit.isDateBasedFlag)
+          Duration.OneYear.multipliedBy(10),
+          ChronoUnit.isDateBasedFlag
+      )
 
   case CENTURIES extends ChronoUnit(
-          Duration.OneYear.multipliedBy(100), ChronoUnit.isDateBasedFlag)
+          Duration.OneYear.multipliedBy(100),
+          ChronoUnit.isDateBasedFlag
+      )
 
   case MILLENNIA extends ChronoUnit(
-          Duration.OneYear.multipliedBy(1000), ChronoUnit.isDateBasedFlag)
+          Duration.OneYear.multipliedBy(1000),
+          ChronoUnit.isDateBasedFlag
+      )
 
   case ERAS extends ChronoUnit(
-          Duration.OneYear.multipliedBy(1000000000), ChronoUnit.isDateBasedFlag)
+          Duration.OneYear.multipliedBy(1000000000),
+          ChronoUnit.isDateBasedFlag
+      )
 
   case FOREVER extends ChronoUnit(Duration.Max, 0)
 

diff --git a/sjavatime/shared/src/main/scala/java/time/Duration.scala b/sjavatime/shared/src/main/scala/java/time/Duration.scala
@@ -142,7 +142,8 @@ final class Duration private (seconds: Long, nanos: Int)
         try {
           val total = Math.addExact(
               Math.multiplyExact(secondsRem, NANOS_IN_SECOND.toLong),
-              normalizedNanos)
+              normalizedNanos
+          )
           total / divisor
         } catch {
           case _: ArithmeticException =>
@@ -193,7 +194,9 @@ final class Duration private (seconds: Long, nanos: Int)
 
   def toNanos(): Long =
     Math.addExact(
-        Math.multiplyExact(seconds, NANOS_IN_SECOND.toLong), nanos)
+        Math.multiplyExact(seconds, NANOS_IN_SECOND.toLong),
+        nanos
+    )
 
   def compareTo(that: Duration): Int = {
     val secCmp = seconds.compareTo(that.getSeconds())

diff --git a/sjavatime/shared/src/main/scala/java/time/Instant.scala b/sjavatime/shared/src/main/scala/java/time/Instant.scala
@@ -92,7 +92,8 @@ final class Instant private (private val seconds: Long, private val nanos: Int)
 
       case _: ChronoField =>
         throw new UnsupportedTemporalTypeException(
-            s"Field not supported: $field")
+            s"Field not supported: $field"
+        )
 
       case _ => field.adjustInto(this, value)
     }
@@ -109,7 +110,8 @@ final class Instant private (private val seconds: Long, private val nanos: Int)
       val unitNanos = duration.toNanos()
       if ((NANOS_IN_DAY % unitNanos) != 0)
         throw new UnsupportedTemporalTypeException(
-            "Unit must be a multiple of a standard day")
+            "Unit must be a multiple of a standard day"
+        )
 
       val extraNanos = (seconds % SECONDS_IN_DAY) * NANOS_IN_SECOND + nanos
       val extraNanosPerUnit = Math.floorDiv(extraNanos, unitNanos) * unitNanos

diff --git a/sjavatime/shared/src/main/scala/java/time/LocalTime.scala b/sjavatime/shared/src/main/scala/java/time/LocalTime.scala
@@ -118,7 +118,8 @@ final class LocalTime private (hour: Int, minute: Int, second: Int, nano: Int)
       case MINUTE_OF_DAY =>
         requireDateTime(value >= 0 && value <= MINUTES_IN_DAY, msg)
         ofNanoOfDay(
-            value * NANOS_IN_MINUTE + second.toLong * NANOS_IN_SECOND + nano)
+            value * NANOS_IN_MINUTE + second.toLong * NANOS_IN_SECOND + nano
+        )
 
       case HOUR_OF_AMPM =>
         requireDateTime(value >= 0 && value <= 11, msg)
@@ -143,7 +144,8 @@ final class LocalTime private (hour: Int, minute: Int, second: Int, nano: Int)
 
       case _: ChronoField =>
         throw new UnsupportedTemporalTypeException(
-            s"Field not supported: $field")
+            s"Field not supported: $field"
+        )
 
       case _ => field.adjustInto(this, value)
     }

diff --git a/sjavatime/shared/src/main/scala/java/time/chrono/Chronology.scala b/sjavatime/shared/src/main/scala/java/time/chrono/Chronology.scala
@@ -10,7 +10,11 @@ trait Chronology extends Comparable[Chronology] {
   def getCalendarType(): String
 
   def date(
-      era: Era, yearOfEra: Int, month: Int, dayOfMonth: Int): ChronoLocalDate =
+      era: Era,
+      yearOfEra: Int,
+      month: Int,
+      dayOfMonth: Int
+  ): ChronoLocalDate =
     date(prolepticYear(era, yearOfEra), month, dayOfMonth)
 
   def date(prolepticYear: Int, month: Int, dayOfMonth: Int): ChronoLocalDate

diff --git a/sjavatime/shared/src/main/scala/java/time/chrono/IsoChronology.scala b/sjavatime/shared/src/main/scala/java/time/chrono/IsoChronology.scala
@@ -11,14 +11,21 @@ final class IsoChronology private () extends AbstractChronology
   def getCalendarType(): String = "iso8601"
 
   override def date(
-      era: Era, yearOfEra: Int, month: Int, dayOfMonth: Int): LocalDate =
+      era: Era,
+      yearOfEra: Int,
+      month: Int,
+      dayOfMonth: Int
+  ): LocalDate =
     date(prolepticYear(era, yearOfEra), month, dayOfMonth)
 
   def date(prolepticYear: Int, month: Int, dayOfMonth: Int): LocalDate =
     LocalDate.of(prolepticYear, month, dayOfMonth)
 
   override def dateYearDay(
-      era: Era, yearOfEra: Int, dayOfYear: Int): LocalDate =
+      era: Era,
+      yearOfEra: Int,
+      dayOfYear: Int
+  ): LocalDate =
     dateYearDay(prolepticYear(era, yearOfEra), dayOfYear)
 
   def dateYearDay(prolepticYear: Int, dayOfYear: Int): LocalDate =