Merge pull request #182 from scala-steward/update/scalafmt-core-3.9.7

Update scalafmt-core to 3.9.7

Author: JD557

.git-blame-ignore-revs

@@ -6,3 +6,6 @@ fb28cb61e3b756de7125c1af8e43770cb7cd006f
 
 # Scala Steward: Reformat with scalafmt 3.8.4
 6bc4920f71407b36edec65017fa623736c4f6115
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+b508ee878ab79d3b64de42e367e2567a20758982

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.9.6
+version = 3.9.7
 
 runner.dialect = "scala3"
 align.preset = more

build.sbt

@@ -5,7 +5,7 @@ ThisBuild / publishTo    := sonatypePublishToBundle.value
 ThisBuild / scalaVersion := "3.3.6"
 ThisBuild / licenses     := Seq("MIT License" -> url("http://opensource.org/licenses/MIT"))
 ThisBuild / homepage     := Some(url("https://github.com/JD557/interim"))
-ThisBuild / scmInfo := Some(
+ThisBuild / scmInfo      := Some(
   ScmInfo(
     url("https://github.com/JD557/interim"),
     "scm:git@github.com:JD557/interim.git"

core/shared/src/main/scala/eu/joaocosta/interim/InputState.scala

@@ -19,7 +19,7 @@ sealed trait InputState:
   def appendKeyboardInput(str: String): String =
     if (keyboardInput.isEmpty) str
     else
-      val fullString = str + keyboardInput
+      val fullString      = str + keyboardInput
       val processedString =
         if (fullString.size >= 2)
           fullString.iterator

core/shared/src/main/scala/eu/joaocosta/interim/TextLayout.scala

@@ -70,8 +70,8 @@ object TextLayout:
           if (dy + textOp.font.fontSize > textOp.textArea.h) layout("", dy, textAcc) // Can't fit this line, end here
           else
             val (thisLine, nextLine) = getNextLine(str, textOp.textArea.w, textOp.font.charWidth)
-            val ops = cumulativeSum(thisLine)(textOp.font.charWidth).map { case (char, dx) =>
-              val width = textOp.font.charWidth(char)
+            val ops                  = cumulativeSum(thisLine)(textOp.font.charWidth).map { case (char, dx) =>
+              val width    = textOp.font.charWidth(char)
               val charArea = Rect(
                 x = textOp.textArea.x + dx - width,
                 y = textOp.textArea.y + dy,
@@ -107,13 +107,13 @@ object TextLayout:
         areaAcc: Rect
     ): Rect =
       remaining match
-        case "" => areaAcc
+        case ""  => areaAcc
         case str =>
           if (dy + font.fontSize > boundingArea.h) layout("", dy, areaAcc) // Can't fit this line, end here
           else
             val (thisLine, nextLine) = getNextLine(str, boundingArea.w, font.charWidth)
-            val charAreas = cumulativeSum(thisLine)(font.charWidth).map { case (char, dx) =>
-              val width = font.charWidth(char)
+            val charAreas            = cumulativeSum(thisLine)(font.charWidth).map { case (char, dx) =>
+              val width    = font.charWidth(char)
               val charArea = Rect(
                 x = boundingArea.x + dx - width,
                 y = boundingArea.y + dy,

core/shared/src/main/scala/eu/joaocosta/interim/layouts/StaticColumnAllocator.scala

@@ -15,7 +15,7 @@ final class StaticColumnAllocator(
     else
       val columnSize    = (area.w - (numColumns - 1) * padding) / numColumns.toDouble
       val intColumnSize = columnSize.toInt
-      val baseCells = for
+      val baseCells     = for
         column <- (0 until numColumns)
         dx = (column * (columnSize + padding)).toInt
       yield Rect(area.x + dx, area.y, intColumnSize, area.h)

core/shared/src/main/scala/eu/joaocosta/interim/layouts/StaticRowAllocator.scala

@@ -15,7 +15,7 @@ final class StaticRowAllocator(
     else
       val rowSize    = (area.h - (numRows - 1) * padding) / numRows.toDouble
       val intRowSize = rowSize.toInt
-      val baseCells = for
+      val baseCells  = for
         row <- (0 until numRows)
         dy = (row * (rowSize + padding)).toInt
       yield Rect(area.x, area.y + dy, area.w, intRowSize)

core/shared/src/main/scala/eu/joaocosta/interim/skins/HandleSkin.scala

@@ -27,7 +27,7 @@ object HandleSkin extends DefaultSkin:
 
     def renderMoveHandle(area: Rect, itemStatus: UiContext.ItemStatus)(using uiContext: UiContext): Unit =
       val handleArea = this.moveHandleArea(area)
-      val color = itemStatus match
+      val color      = itemStatus match
         case UiContext.ItemStatus(false, false, _, _) => colorScheme.icon
         case UiContext.ItemStatus(true, false, _, _)  => colorScheme.iconHighlight
         case UiContext.ItemStatus(_, true, _, _)      => colorScheme.primaryHighlight
@@ -41,7 +41,7 @@ object HandleSkin extends DefaultSkin:
 
     def renderCloseHandle(area: Rect, itemStatus: UiContext.ItemStatus)(using uiContext: UiContext): Unit =
       val handleArea = this.closeHandleArea(area)
-      val color = itemStatus match
+      val color      = itemStatus match
         case UiContext.ItemStatus(false, false, _, _) => colorScheme.icon
         case UiContext.ItemStatus(true, false, _, _)  => colorScheme.iconHighlight
         case UiContext.ItemStatus(_, true, _, _)      => colorScheme.primaryHighlight
@@ -53,7 +53,7 @@ object HandleSkin extends DefaultSkin:
 
     def renderResizeHandle(area: Rect, itemStatus: UiContext.ItemStatus)(using uiContext: UiContext): Unit =
       val handleArea = this.resizeHandleArea(area)
-      val color = itemStatus match
+      val color      = itemStatus match
         case UiContext.ItemStatus(false, false, _, _) => colorScheme.icon
         case UiContext.ItemStatus(true, false, _, _)  => colorScheme.iconHighlight
         case UiContext.ItemStatus(_, true, _, _)      => colorScheme.primaryHighlight

core/shared/src/main/scala/eu/joaocosta/interim/skins/SliderSkin.scala

@@ -32,15 +32,15 @@ object SliderSkin extends DefaultSkin:
       val sliderRect =
         if (area.w > area.h)
           val sliderSize = math.max(minSliderSize, sliderArea.w / steps)
-          val maxX =
+          val maxX       =
             (steps + 1) * sliderArea.w / steps - sliderSize // Correction for when the slider hits the min size
           val deltaX = delta * maxX / steps
           Rect(0, 0, sliderSize, sliderArea.h)
             .centerAt(0, sliderArea.centerY)
             .copy(x = sliderArea.x + deltaX)
         else
           val sliderSize = math.max(minSliderSize, sliderArea.h / steps)
-          val maxY =
+          val maxY       =
             (steps + 1) * sliderArea.h / steps - sliderSize // Correction for when the slider hits the min size
           val deltaY = delta * maxY / steps
           Rect(0, 0, sliderArea.w, sliderSize)

core/shared/src/test/scala/eu/joaocosta/interim/api/LayoutsSpec.scala

@@ -28,7 +28,7 @@ class LayoutsSpec extends munit.FunSuite:
     assertEquals(itemStatus.hot, true)
 
   test("grid correctly lays out elements in a grid"):
-    val areas = Layouts.grid(Rect(10, 10, 100, 100), numRows = 3, numColumns = 2, padding = 8)(identity)
+    val areas    = Layouts.grid(Rect(10, 10, 100, 100), numRows = 3, numColumns = 2, padding = 8)(identity)
     val expected =
       Vector(
         Vector(Rect(10, 10, 46, 28), Rect(64, 10, 46, 28)),
@@ -51,7 +51,7 @@ class LayoutsSpec extends munit.FunSuite:
     assertEquals(areas, expected)
 
   test("rows correctly lays out elements in rows"):
-    val areas = Layouts.rows(Rect(10, 10, 100, 100), numRows = 3, padding = 8)(alloc ?=> alloc.toVector)
+    val areas    = Layouts.rows(Rect(10, 10, 100, 100), numRows = 3, padding = 8)(alloc ?=> alloc.toVector)
     val expected =
       Vector(Rect(10, 10, 100, 28), Rect(10, 46, 100, 28), Rect(10, 82, 100, 28))
     assertEquals(areas, expected)
@@ -62,7 +62,7 @@ class LayoutsSpec extends munit.FunSuite:
     assertEquals(areas, expected)
 
   test("columns correctly lays out elements in columns"):
-    val areas = Layouts.columns(Rect(10, 10, 100, 100), numColumns = 3, padding = 8)(alloc ?=> alloc.toVector)
+    val areas    = Layouts.columns(Rect(10, 10, 100, 100), numColumns = 3, padding = 8)(alloc ?=> alloc.toVector)
     val expected =
       Vector(Rect(10, 10, 28, 100), Rect(46, 10, 28, 100), Rect(82, 10, 28, 100))
     assertEquals(areas, expected)