Merge pull request cquiroz#409 from cquiroz/sfmt

cquiroz · web-flow · commit 0a3a265910fa · 2022-11-10T22:17:12.000-03:00
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.5.2"
+version = "3.5.9"
 style = default
 
 maxColumn = 100
diff --git a/core/shared/src/main/scala/org/threeten/bp/LocalTime.scala b/core/shared/src/main/scala/org/threeten/bp/LocalTime.scala
@@ -588,7 +588,7 @@ final class LocalTime(_hour: Int, _minute: Int, _second: Int, private val nano:
       case MICRO_OF_SECOND    => nano.toLong / 1000L
       case MICRO_OF_DAY       => throw new DateTimeException(s"Field too large for an int: $field")
       case MILLI_OF_SECOND    => nano.toLong / 1000000L
-      case MILLI_OF_DAY       => (toNanoOfDay / 1000000L)
+      case MILLI_OF_DAY       => toNanoOfDay / 1000000L
       case SECOND_OF_MINUTE   => second.toLong
       case SECOND_OF_DAY      => toSecondOfDay.toLong
       case MINUTE_OF_HOUR     => minute.toLong
diff --git a/core/shared/src/main/scala/org/threeten/bp/ZonedDateTime.scala b/core/shared/src/main/scala/org/threeten/bp/ZonedDateTime.scala
@@ -615,7 +615,7 @@ final class ZonedDateTime(
     field match {
       case _: ChronoField => true
       case _              =>
-        (field != null && field.isSupportedBy(this))
+        field != null && field.isSupportedBy(this)
     }
 
   def isSupported(unit: TemporalUnit): Boolean =
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/HijrahDate.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/HijrahDate.scala
@@ -525,7 +525,7 @@ object HijrahDate {
     }
     if (cycleDays == null)
       cycleDays = java.lang.Long.valueOf(cycleNumber.toLong * 10631)
-    (cycleDays.longValue + dayInCycle + HIJRAH_JAN_1_1_GREGORIAN_DAY - 1)
+    cycleDays.longValue + dayInCycle + HIJRAH_JAN_1_1_GREGORIAN_DAY - 1
   }
 
   /**
diff --git a/core/shared/src/main/scala/org/threeten/bp/chrono/IsoChronology.scala b/core/shared/src/main/scala/org/threeten/bp/chrono/IsoChronology.scala
@@ -374,14 +374,14 @@ final class IsoChronology private () extends Chronology with Serializable {
           if (year != null)
             updateResolveMap(fieldValues,
                              YEAR,
-                             (if (year > 0) yoeLong else Math.subtractExact(1, yoeLong))
+                             if (year > 0) yoeLong else Math.subtractExact(1, yoeLong)
             )
           else fieldValues.put(YEAR_OF_ERA, yoeLong)
         else
           updateResolveMap(
             fieldValues,
             YEAR,
-            (if (year == null || year > 0) yoeLong else Math.subtractExact(1, yoeLong))
+            if (year == null || year > 0) yoeLong else Math.subtractExact(1, yoeLong)
           )
       } else if (era.longValue == 1L)
         updateResolveMap(fieldValues, YEAR, yoeLong)
diff --git a/core/shared/src/main/scala/org/threeten/bp/format/internal/TTBPSimpleDateTimeTextProvider.scala b/core/shared/src/main/scala/org/threeten/bp/format/internal/TTBPSimpleDateTimeTextProvider.scala
@@ -95,10 +95,10 @@ object TTBPSimpleDateTimeTextProvider {
               val continue = !acc.contains(v)
               (continue, acc + (v -> (v -> k)))
           }
-        val list    = reverse._2.values.toList.sortBy(x => (-x._1.length))
+        val list    = reverse._2.values.toList.sortBy(x => -x._1.length)
         (all ::: list, map + (style -> list))
       }
-      (u._1.sortBy(x => (-x._1.length)), u._2)
+      (u._1.sortBy(x => -x._1.length), u._2)
     }
 
     /**
diff --git a/core/shared/src/main/scala/org/threeten/bp/temporal/TemporalAdjusters.scala b/core/shared/src/main/scala/org/threeten/bp/temporal/TemporalAdjusters.scala
@@ -295,7 +295,7 @@ object TemporalAdjusters {
         val temp: Temporal = temporal.`with`(DAY_OF_MONTH, temporal.range(DAY_OF_MONTH).getMaximum)
         val curDow: Int    = temp.get(DAY_OF_WEEK)
         var daysDiff: Int  = dowValue - curDow
-        daysDiff = if (daysDiff == 0) 0 else (if (daysDiff > 0) daysDiff - 7 else daysDiff)
+        daysDiff = if (daysDiff == 0) 0 else if (daysDiff > 0) daysDiff - 7 else daysDiff
         daysDiff -= ((-ordinal - 1L) * 7L).toInt
         temp.plus(daysDiff.toLong, DAYS)
       }
diff --git a/core/shared/src/main/scala/org/threeten/bp/zone/StandardZoneRules.scala b/core/shared/src/main/scala/org/threeten/bp/zone/StandardZoneRules.scala
@@ -194,30 +194,31 @@ final class StandardZoneRules private (
     wallOffsets:               Array[ZoneOffset],
     lastRules:                 Array[ZoneOffsetTransitionRule]
   ) =
-    this(standardTransitions,
-         standardOffsets,
-         savingsInstantTransitions,
-         wallOffsets,
-         lastRules, {
-           val localTransitionList: java.util.List[LocalDateTime] =
-             new java.util.ArrayList[LocalDateTime]
-           var i: Int                                             = 0
-           while (i < savingsInstantTransitions.length) {
-             val before: ZoneOffset          = wallOffsets(i)
-             val after: ZoneOffset           = wallOffsets(i + 1)
-             val trans: ZoneOffsetTransition =
-               new ZoneOffsetTransition(savingsInstantTransitions(i), before, after)
-             if (trans.isGap) {
-               localTransitionList.add(trans.getDateTimeBefore)
-               localTransitionList.add(trans.getDateTimeAfter)
-             } else {
-               localTransitionList.add(trans.getDateTimeAfter)
-               localTransitionList.add(trans.getDateTimeBefore)
-             }
-             i += 1
-           }
-           localTransitionList.toArray(new Array[LocalDateTime](localTransitionList.size))
-         }
+    this(
+      standardTransitions,
+      standardOffsets,
+      savingsInstantTransitions,
+      wallOffsets,
+      lastRules, {
+        val localTransitionList: java.util.List[LocalDateTime] =
+          new java.util.ArrayList[LocalDateTime]
+        var i: Int                                             = 0
+        while (i < savingsInstantTransitions.length) {
+          val before: ZoneOffset          = wallOffsets(i)
+          val after: ZoneOffset           = wallOffsets(i + 1)
+          val trans: ZoneOffsetTransition =
+            new ZoneOffsetTransition(savingsInstantTransitions(i), before, after)
+          if (trans.isGap) {
+            localTransitionList.add(trans.getDateTimeBefore)
+            localTransitionList.add(trans.getDateTimeAfter)
+          } else {
+            localTransitionList.add(trans.getDateTimeAfter)
+            localTransitionList.add(trans.getDateTimeBefore)
+          }
+          i += 1
+        }
+        localTransitionList.toArray(new Array[LocalDateTime](localTransitionList.size))
+      }
     )
 
   def isFixedOffset: Boolean = savingsInstantTransitions.length == 0
diff --git a/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDate.scala b/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDate.scala
@@ -160,11 +160,11 @@ object TestChronoLocalDate {
 
 class TestChronoLocalDate extends AnyFunSuite with AssertionsHelper {
   val data_of_calendars: List[Chronology] =
-    List[Chronology]((HijrahChronology.INSTANCE),
-                     (IsoChronology.INSTANCE),
+    List[Chronology](HijrahChronology.INSTANCE,
+                     IsoChronology.INSTANCE,
                      // (JapaneseChronology.INSTANCE),
-                     (MinguoChronology.INSTANCE),
-                     (ThaiBuddhistChronology.INSTANCE)
+                     MinguoChronology.INSTANCE,
+                     ThaiBuddhistChronology.INSTANCE
     )
 
   test("test_badWithAdjusterChrono") {
diff --git a/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDateTime.scala b/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDateTime.scala
@@ -159,11 +159,11 @@ object TestChronoLocalDateTime {
 
 class TestChronoLocalDateTime extends AnyFunSuite with AssertionsHelper {
   val data_of_calendars: List[Chronology] =
-    List((HijrahChronology.INSTANCE),
-         (IsoChronology.INSTANCE),
+    List(HijrahChronology.INSTANCE,
+         IsoChronology.INSTANCE,
          // (JapaneseChronology.INSTANCE),
-         (MinguoChronology.INSTANCE),
-         (ThaiBuddhistChronology.INSTANCE)
+         MinguoChronology.INSTANCE,
+         ThaiBuddhistChronology.INSTANCE
     )
 
   test("test_badWithAdjusterChrono") {
diff --git a/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoZonedDateTime.scala b/tests/shared/src/test/scala/org/threeten/bp/chrono/TestChronoZonedDateTime.scala
@@ -160,11 +160,11 @@ object TestChronoZonedDateTime {
 
 class TestChronoZonedDateTime extends AnyFunSuite with AssertionsHelper {
   val data_of_calendars: List[Chronology] =
-    List((HijrahChronology.INSTANCE),
-         (IsoChronology.INSTANCE),
+    List(HijrahChronology.INSTANCE,
+         IsoChronology.INSTANCE,
          // (JapaneseChronology.INSTANCE),
-         (MinguoChronology.INSTANCE),
-         (ThaiBuddhistChronology.INSTANCE)
+         MinguoChronology.INSTANCE,
+         ThaiBuddhistChronology.INSTANCE
     )
 
   test("test_badWithAdjusterChrono") {
diff --git a/tests/shared/src/test/scala/org/threeten/bp/format/TestNumberParser.scala b/tests/shared/src/test/scala/org/threeten/bp/format/TestNumberParser.scala
@@ -276,7 +276,7 @@ class TestNumberParser extends AnyFunSuite with GenTestPrinterParser with Assert
 
   test("parseSignsStrict") {
     provider_parseSignsStrict.foreach {
-      case (input: String) :: (min: Int) :: (max: Int) :: (style: SignStyle) :: (parseLen: Int) ::(Some(
+      case (input: String) :: (min: Int) :: (max: Int) :: (style: SignStyle) :: (parseLen: Int) :: (Some(
             parseVal: Int
           )) :: Nil =>
         super.beforeEach()
@@ -382,7 +382,7 @@ class TestNumberParser extends AnyFunSuite with GenTestPrinterParser with Assert
 
   test("parseSignsLenient") {
     provider_parseSignsLenient.foreach {
-      case (input: String) :: (min: Int) :: (max: Int) :: (style: SignStyle) :: (parseLen: Int) ::(Some(
+      case (input: String) :: (min: Int) :: (max: Int) :: (style: SignStyle) :: (parseLen: Int) :: (Some(
             parseVal: Int
           )) :: Nil =>
         super.beforeEach()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.5.2"`
	`1`	`+version = "3.5.9"`
`2`	`2`	`style = default`
`3`	`3`
`4`	`4`	`maxColumn = 100`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ final class ZonedDateTime(`
`615`	`615`	`field match {`
`616`	`616`	`case _: ChronoField => true`
`617`	`617`	`case _ =>`
`618`		`- (field != null && field.isSupportedBy(this))`
	`618`	`+ field != null && field.isSupportedBy(this)`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`def isSupported(unit: TemporalUnit): Boolean =`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ object HijrahDate {`
`525`	`525`	`}`
`526`	`526`	`if (cycleDays == null)`
`527`	`527`	`cycleDays = java.lang.Long.valueOf(cycleNumber.toLong * 10631)`
`528`		`- (cycleDays.longValue + dayInCycle + HIJRAH_JAN_1_1_GREGORIAN_DAY - 1)`
	`528`	`+ cycleDays.longValue + dayInCycle + HIJRAH_JAN_1_1_GREGORIAN_DAY - 1`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,10 @@ object TTBPSimpleDateTimeTextProvider {`
`95`	`95`	`val continue = !acc.contains(v)`
`96`	`96`	`(continue, acc + (v -> (v -> k)))`
`97`	`97`	`}`
`98`		`- val list = reverse._2.values.toList.sortBy(x => (-x._1.length))`
	`98`	`+ val list = reverse._2.values.toList.sortBy(x => -x._1.length)`
`99`	`99`	`(all ::: list, map + (style -> list))`
`100`	`100`	`}`
`101`		`- (u._1.sortBy(x => (-x._1.length)), u._2)`
	`101`	`+ (u._1.sortBy(x => -x._1.length), u._2)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ object TemporalAdjusters {`
`295`	`295`	val temp: Temporal = temporal.`with`(DAY_OF_MONTH, temporal.range(DAY_OF_MONTH).getMaximum)
`296`	`296`	`val curDow: Int = temp.get(DAY_OF_WEEK)`
`297`	`297`	`var daysDiff: Int = dowValue - curDow`
`298`		`- daysDiff = if (daysDiff == 0) 0 else (if (daysDiff > 0) daysDiff - 7 else daysDiff)`
	`298`	`+ daysDiff = if (daysDiff == 0) 0 else if (daysDiff > 0) daysDiff - 7 else daysDiff`
`299`	`299`	`daysDiff -= ((-ordinal - 1L) * 7L).toInt`
`300`	`300`	`temp.plus(daysDiff.toLong, DAYS)`
`301`	`301`	`}`