format

kitlangton · kitlangton · commit 8e0dc6819446 · 2025-03-07T17:36:08.000-06:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.4]
+        scala: [3.3.5]
         java: [zulu@8, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.4]
+        scala: [3.3.5]
         java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -101,12 +101,12 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Download target directories (3.3.4)
+      - name: Download target directories (3.3.5)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.3.5-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.4)
+      - name: Inflate target directories (3.3.5)
         run: |
           tar xf targets.tar
           rm targets.tar
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,13 @@
+rules = [
+  RemoveUnused,
+  OrganizeImports,
+  RedundantSyntax,
+  NoValInForComprehension
+]
+
+OrganizeImports {
+  groupedImports = Merge
+  targetDialect = Scala3
+}
+
+RemoveUnused.imports = false
diff --git a/build.sbt b/build.sbt
@@ -13,6 +13,7 @@ inThisBuild(
     organization       := "io.github.kitlangton",
     homepage           := Some(url("https://github.com/kitlangton/animus")),
     licenses           := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+    semanticdbEnabled  := true,
     developers := List(
       Developer(
         "kitlangton",
@@ -24,6 +25,9 @@ inThisBuild(
   )
 )
 
+Global / onChangedBuildSource := ReloadOnSourceChanges
+addCommandAlias("prepare", "scalafixAll;githubWorkflowGenerate")
+
 ////////////////////////
 // sbt-github-actions //
 ////////////////////////
@@ -57,9 +61,10 @@ lazy val scalacSettings =
   "-unchecked" ::
     "-deprecation" ::
     "-feature" ::
+    "-Wunused:imports" ::
     Nil
 
-val zioVersion     = "2.1.15"
+val zioVersion     = "2.1.16"
 val laminarVersion = "17.2.0"
 
 lazy val commonSettings = Seq(
@@ -112,7 +117,7 @@ lazy val example = project
     skip / publish := true,
     libraryDependencies ++= Seq(
       "dev.zio" %%% "zio"      % zioVersion,
-      "dev.zio" %%% "zio-json" % "0.7.21"
+      "dev.zio" %%% "zio-json" % "0.7.39"
     )
   )
   .enablePlugins(ScalaJSPlugin)
diff --git a/example/src/main/scala/example/AnimatedCount.scala b/example/src/main/scala/example/AnimatedCount.scala
@@ -1,7 +1,7 @@
 package example
 
-import com.raquo.laminar.api.L.*
 import animus.*
+import com.raquo.laminar.api.L.*
 
 case class AnimatedCount($count: Signal[Int]) extends Component:
   val $digits: Signal[List[(String, Int)]] =
diff --git a/example/src/main/scala/example/AnimatedTitle.scala b/example/src/main/scala/example/AnimatedTitle.scala
@@ -1,7 +1,7 @@
 package example
 
-import com.raquo.laminar.api.L.*
 import animus.*
+import com.raquo.laminar.api.L.*
 
 object AnimatedTitle extends Component:
   val activeVar = Var(true)
diff --git a/example/src/main/scala/example/Component.scala b/example/src/main/scala/example/Component.scala
@@ -1,13 +1,11 @@
 package example
 
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.*
 
 import scala.language.implicitConversions
 
-trait Component {
+trait Component:
   def body: HtmlElement
-}
 
-object Component {
+object Component:
   implicit def toLaminarElement(component: Component): HtmlElement = component.body
-}
diff --git a/example/src/main/scala/example/Main.scala b/example/src/main/scala/example/Main.scala
@@ -219,10 +219,10 @@ object Main:
             )
           },
           adjectiveOne.body,
-          div(s"and"),
+          div("and"),
           AdjectiveView().body
         ),
-        div(s"spring animation library for Scala.js.")
+        div("spring animation library for Scala.js.")
       )
 //      todosView
     )
@@ -276,7 +276,7 @@ object Main:
 
     def body =
       div(
-        cls(s"flex flex-col my-[8px] mx-2 overflow-hidden not-italic"),
+        cls("flex flex-col my-[8px] mx-2 overflow-hidden not-italic"),
         // skew
         transform("skewX(-15deg)"),
         fontFamily("Bebas Neue"),
diff --git a/example/src/main/scala/example/PerformanceTest.scala b/example/src/main/scala/example/PerformanceTest.scala
@@ -1,11 +1,11 @@
 package example
 
 import animus.SignalOps
-import com.raquo.laminar.api.L._
+import com.raquo.laminar.api.L.*
 
 import scala.util.Random
 
-object PerformanceTest {
+object PerformanceTest:
   val positionVar: Var[Double] = Var(0.0)
 
   def every[A](a: => A, ms: => Int = 300): Signal[A] =
@@ -15,7 +15,7 @@ object PerformanceTest {
 
   val colors = Vector("#888", "#ccc", "#ddd", "#fff")
 
-  def randomCube = {
+  def randomCube =
 
     def coord =
       ((Random.nextDouble() * 150) - 75 + mousePosition._1, (Random.nextDouble() * 150) - 75 + mousePosition._2)
@@ -30,7 +30,6 @@ object PerformanceTest {
       svg.x <-- $xyPosition.map(_._1).px,
       svg.y <-- $xyPosition.map(_._2).px
     )
-  }
 
   def body: Div =
     div(
@@ -61,4 +60,3 @@ object PerformanceTest {
 //        left <-- positionVar.signal.sprinkle.px
 //      )
     )
-}
diff --git a/example/src/main/scala/example/TimeWasted.scala b/example/src/main/scala/example/TimeWasted.scala
@@ -1,11 +1,11 @@
 package example
 
-import animus._
-import com.raquo.laminar.api.L._
+import animus.*
+import com.raquo.laminar.api.L.*
 
 import scala.util.Random
 
-object TimeWasted extends Component {
+object TimeWasted extends Component:
   val $count: Signal[Int] =
     EventStream.periodic(1000).toSignal(0)
 
@@ -78,5 +78,3 @@ object TimeWasted extends Component {
       )
     )
   )
-
-}
diff --git a/example/src/main/scala/example/components/package.scala b/example/src/main/scala/example/components/package.scala
@@ -1,9 +1,9 @@
 package example
 
-import animus._
-import com.raquo.laminar.api.L._
+import animus.*
+import com.raquo.laminar.api.L.*
 
-package object components {
+package object components:
   def FadeInWords(string: String, delay: Int = 0): Modifier[HtmlElement] =
     string.split(" ").zipWithIndex.toList.map { case (word, idx) =>
       val $opacity = Animation.from(0).wait(delay + 150 * idx).to(1).run
@@ -60,4 +60,3 @@ package object components {
 //      )
 //    )
 //
-}
diff --git a/modules/core/js/src/main/scala/animus/Animation.scala b/modules/core/js/src/main/scala/animus/Animation.scala
@@ -5,18 +5,18 @@ import com.raquo.airstream.state.Var
 
 import scala.scalajs.js.timers.setTimeout
 
-sealed trait Animation { self =>
-  import Animation._
+sealed trait Animation:
+  self =>
+  import Animation.*
 
-  def to(double: => Double): Animation = {
+  def to(double: => Double): Animation =
     lazy val double0 = double
     Sequence(self, Value(() => double0))
-  }
 
   def wait(ms: Int): Animation = Hold(ms, self)
 
   def flattened: Vector[(() => Double, Double)] =
-    self match {
+    self match
       case Value(value) => Vector((value, 300))
       case Hold(delay, animation) =>
         val flatAnim                            = animation.flattened
@@ -25,9 +25,8 @@ sealed trait Animation { self =>
         res
       case Sequence(lhs, rhs) =>
         lhs.flattened ++ rhs.flattened
-    }
 
-  def signal: Signal[Double] = {
+  def signal: Signal[Double] =
     val flat     = flattened
     val variable = Var(flat.head._1())
 
@@ -41,19 +40,14 @@ sealed trait Animation { self =>
     go(flat)
 
     variable.signal
-  }
 
   def run: Signal[Double] = signal.spring
 
-}
-
-object Animation {
-  def from(double: => Double): Animation = {
+object Animation:
+  def from(double: => Double): Animation =
     lazy val double0 = double
     Value(() => double0)
-  }
 
   private case class Value(value: () => Double)               extends Animation
   private case class Hold(delay: Int, animation: Animation)   extends Animation
   private case class Sequence(lhs: Animation, rhs: Animation) extends Animation
-}
diff --git a/modules/core/js/src/main/scala/animus/OrderedSet.scala b/modules/core/js/src/main/scala/animus/OrderedSet.scala
@@ -2,8 +2,8 @@ package animus
 
 import scala.collection.mutable.ListBuffer
 
-class OrderedSet[A](var underlying: Vector[A]) {
-  def addValues(as: Seq[A]): Unit = {
+class OrderedSet[A](var underlying: Vector[A]):
+  def addValues(as: Seq[A]): Unit =
     val newKeys     = as.toSet
     val prevKeys    = underlying.toSet
     val removedKeys = prevKeys -- newKeys
@@ -19,16 +19,15 @@ class OrderedSet[A](var underlying: Vector[A]) {
     var lastIdx = -9
     as.zipWithIndex.foreach { case (a, idx) =>
       val toAdd =
-        removed.takeWhile { case (idx0, _) =>
-          val result = idx0 <= relativeCount + idx || lastIdx + 1 == idx0
-          if (result)
-            lastIdx = idx0
-          result
-        }
+        removed
+          .takeWhile { case (idx0, _) =>
+            val result = idx0 <= relativeCount + idx || lastIdx + 1 == idx0
+            if result then lastIdx = idx0
+            result
+          }
           .map(_._2)
 
-      if (addedKeys(a))
-        relativeCount -= 1
+      if addedKeys(a) then relativeCount -= 1
       relativeCount += toAdd.length
       removed = removed.drop(toAdd.length)
       builder.addAll(toAdd)
@@ -37,10 +36,8 @@ class OrderedSet[A](var underlying: Vector[A]) {
     builder.addAll(removed.map(_._2))
 
     underlying = builder.toVector
-  }
 
   def remove(value: A): Unit =
     underlying = underlying.filterNot(_ == value)
 
   def toList: List[A] = underlying.toList
-}
diff --git a/modules/core/js/src/main/scala/animus/ResizeObserver.scala b/modules/core/js/src/main/scala/animus/ResizeObserver.scala
@@ -1,9 +1,6 @@
 package animus
 
-import com.raquo.airstream.core.Protected
 import com.raquo.airstream.ownership.Subscription
-import com.raquo.laminar.DomApi
-import com.raquo.laminar.api.L
 import com.raquo.laminar.api.L.*
 import com.raquo.laminar.lifecycle.MountContext
 import com.raquo.laminar.nodes.ReactiveElement
diff --git a/modules/core/js/src/main/scala/animus/Transitions.scala b/modules/core/js/src/main/scala/animus/Transitions.scala
@@ -2,8 +2,8 @@ package animus
 
 import com.raquo.airstream.core.Signal
 import com.raquo.airstream.state.Var
-import com.raquo.laminar.api.L.*
 import com.raquo.laminar.api.L
+import com.raquo.laminar.api.L.*
 
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
diff --git a/modules/core/js/src/main/scala/com/raquo/airstream/core/SpringSignal.scala b/modules/core/js/src/main/scala/com/raquo/airstream/core/SpringSignal.scala
@@ -1,13 +1,9 @@
 package com.raquo.airstream.core
 
+import animus.{Animator, VectorArithmetic}
 import com.raquo.airstream.common.SingleParentSignal
-import org.scalajs.dom.window.requestAnimationFrame
-import animus.VectorArithmetic
 
 import scala.util.Try
-import animus.Animator
-
-import scala.collection.mutable
 
 class SpringSignal[A](
     override protected val parent: Signal[A],
diff --git a/modules/core/js/src/main/scala/com/raquo/airstream/core/TransitioningSignal.scala b/modules/core/js/src/main/scala/com/raquo/airstream/core/TransitioningSignal.scala
@@ -1,6 +1,6 @@
 package com.raquo.airstream.core
 
-import animus.{OrderedSet, Transition, TransitionSet, TransitionStatus}
+import animus.{OrderedSet, Transition, TransitionStatus}
 import com.raquo.airstream.common.SingleParentSignal
 import com.raquo.airstream.state.Var
 
diff --git a/modules/core/shared/src/main/scala/animus/TransitionSet.scala b/modules/core/shared/src/main/scala/animus/TransitionSet.scala
@@ -1,6 +1,6 @@
 package animus
 
-import animus.TransitionStatus._
+import animus.TransitionStatus.*
 
 object TransitionSet {
   def empty[A]: TransitionSet[A, A] =
diff --git a/modules/core/shared/src/main/scala/animus/VectorArithmetic.scala b/modules/core/shared/src/main/scala/animus/VectorArithmetic.scala
@@ -2,8 +2,6 @@ package animus
 
 import animus.internal.VectorArithmeticMacro
 
-import scala.scalajs.js
-
 trait VectorArithmetic[A]:
   def subtract(lhs: A, rhs: A): A
   def add(lhs: A, rhs: A): A
diff --git a/modules/core/shared/src/main/scala/animus/internal/VectorArithmeticMacro.scala b/modules/core/shared/src/main/scala/animus/internal/VectorArithmeticMacro.scala
@@ -1,9 +1,9 @@
 package animus.internal
 
 import animus.VectorArithmetic
+import quotidian.*
 
 import scala.quoted.*
-import quotidian.*
 
 // trait VectorArithmetic[A]:
 //  def subtract(lhs: A, rhs: A): A
diff --git a/project/plugins.sbt b/project/plugins.sbt

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package example`
`2`	`2`
`3`		`-import animus._`
`4`		`-import com.raquo.laminar.api.L._`
	`3`	`+import animus.*`
	`4`	`+import com.raquo.laminar.api.L.*`
`5`	`5`
`6`	`6`	`import scala.util.Random`
`7`	`7`
`8`		`-object TimeWasted extends Component {`
	`8`	`+object TimeWasted extends Component:`
`9`	`9`	`val $count: Signal[Int] =`
`10`	`10`	`EventStream.periodic(1000).toSignal(0)`
`11`	`11`
`@@ -78,5 +78,3 @@ object TimeWasted extends Component {`
`78`	`78`	`)`
`79`	`79`	`)`
`80`	`80`	`)`
`81`		`-`
`82`		`-}`