chore: sort and group imports with scalafmt

ghostbuster91 · ghostbuster91 · commit 903ab822dce0 · 2025-05-16T10:19:59.000+02:00
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,6 +1,22 @@
 version = "3.8.0"
 runner.dialect = scala213
 maxColumn = 120
+
+rewrite {
+  rules = [
+    ExpandImportSelectors,
+    Imports
+  ]
+
+  imports {
+    groups = [
+      ["[a-z].*"],
+      ["java\\..*", "scala\\..*"]
+    ]
+    sort = original
+  }
+}
+
 fileOverride {
   "glob:**/fs2/src/**" {
      runner.dialect = scala213source3
diff --git a/modules/core/src/main/scala/jsonrpclib/CallId.scala b/modules/core/src/main/scala/jsonrpclib/CallId.scala
@@ -1,6 +1,8 @@
 package jsonrpclib
 
-import io.circe.{Decoder, Json, Codec}
+import io.circe.Codec
+import io.circe.Decoder
+import io.circe.Json
 
 sealed trait CallId
 object CallId {
diff --git a/modules/core/src/main/scala/jsonrpclib/Channel.scala b/modules/core/src/main/scala/jsonrpclib/Channel.scala
@@ -1,8 +1,8 @@
 package jsonrpclib
 
-import jsonrpclib.ErrorCodec.errorPayloadCodec
-import io.circe.Encoder
 import io.circe.Decoder
+import io.circe.Encoder
+import jsonrpclib.ErrorCodec.errorPayloadCodec
 
 trait Channel[F[_]] {
   def mountEndpoint(endpoint: Endpoint[F]): F[Unit]
diff --git a/modules/core/src/main/scala/jsonrpclib/Endpoint.scala b/modules/core/src/main/scala/jsonrpclib/Endpoint.scala
@@ -1,8 +1,8 @@
 package jsonrpclib
 
-import jsonrpclib.ErrorCodec.errorPayloadCodec
 import io.circe.Decoder
 import io.circe.Encoder
+import jsonrpclib.ErrorCodec.errorPayloadCodec
 
 sealed trait Endpoint[F[_]] {
   def method: String
diff --git a/modules/core/src/main/scala/jsonrpclib/ErrorPayload.scala b/modules/core/src/main/scala/jsonrpclib/ErrorPayload.scala
@@ -1,6 +1,7 @@
 package jsonrpclib
 
-import io.circe.{Decoder, Encoder}
+import io.circe.Decoder
+import io.circe.Encoder
 
 case class ErrorPayload(code: Int, message: String, data: Option[Payload]) extends Throwable {
   override def getMessage(): String = s"JsonRPC Error $code: $message"
diff --git a/modules/core/src/main/scala/jsonrpclib/Monadic.scala b/modules/core/src/main/scala/jsonrpclib/Monadic.scala
@@ -1,7 +1,7 @@
 package jsonrpclib
 
-import scala.concurrent.Future
 import scala.concurrent.ExecutionContext
+import scala.concurrent.Future
 
 trait Monadic[F[_]] {
   def doFlatMap[A, B](fa: F[A])(f: A => F[B]): F[B]
diff --git a/modules/core/src/main/scala/jsonrpclib/Payload.scala b/modules/core/src/main/scala/jsonrpclib/Payload.scala
@@ -1,6 +1,8 @@
 package jsonrpclib
 
-import io.circe.{Decoder, Encoder, Json}
+import io.circe.Decoder
+import io.circe.Encoder
+import io.circe.Json
 
 case class Payload(data: Json) {
   def stripNull: Option[Payload] = Option(Payload(data)).filter(p => !p.data.isNull)
diff --git a/modules/core/src/main/scala/jsonrpclib/internals/FutureBaseChannel.scala b/modules/core/src/main/scala/jsonrpclib/internals/FutureBaseChannel.scala
@@ -1,13 +1,13 @@
 package jsonrpclib
 
+import io.circe.Encoder
 import jsonrpclib.internals._
 
 import java.util.concurrent.atomic.AtomicLong
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.util.Try
-import io.circe.Encoder
 
 abstract class FutureBasedChannel(endpoints: List[Endpoint[Future]])(implicit ec: ExecutionContext)
     extends MessageDispatcher[Future] {
diff --git a/modules/core/src/main/scala/jsonrpclib/internals/MessageDispatcher.scala b/modules/core/src/main/scala/jsonrpclib/internals/MessageDispatcher.scala
@@ -1,14 +1,15 @@
 package jsonrpclib
 package internals
 
+import io.circe.Decoder
+import io.circe.Encoder
+import io.circe.HCursor
 import jsonrpclib.Endpoint.NotificationEndpoint
 import jsonrpclib.Endpoint.RequestResponseEndpoint
 import jsonrpclib.OutputMessage.ErrorMessage
 import jsonrpclib.OutputMessage.ResponseMessage
+
 import scala.util.Try
-import io.circe.HCursor
-import io.circe.Encoder
-import io.circe.Decoder
 
 private[jsonrpclib] abstract class MessageDispatcher[F[_]](implicit F: Monadic[F]) extends Channel.MonadicChannel[F] {
 
diff --git a/modules/core/src/main/scala/jsonrpclib/internals/RawMessage.scala b/modules/core/src/main/scala/jsonrpclib/internals/RawMessage.scala
@@ -1,8 +1,10 @@
 package jsonrpclib
 package internals
 
-import io.circe.{Decoder, Encoder, Json}
 import io.circe.syntax._
+import io.circe.Decoder
+import io.circe.Encoder
+import io.circe.Json
 
 private[jsonrpclib] case class RawMessage(
     jsonrpc: String,
diff --git a/modules/core/src/test/scala/jsonrpclib/CallIdSpec.scala b/modules/core/src/test/scala/jsonrpclib/CallIdSpec.scala
@@ -1,10 +1,10 @@
 package jsonrpclib
 
-import weaver._
+import cats.syntax.all._
+import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
 import com.github.plokhotnyuk.jsoniter_scala.core._
 import io.circe.Json
-import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
-import cats.syntax.all._
+import weaver._
 
 object CallIdSpec extends FunSuite {
   test("json parsing") {
diff --git a/modules/core/src/test/scala/jsonrpclib/RawMessageSpec.scala b/modules/core/src/test/scala/jsonrpclib/RawMessageSpec.scala
@@ -1,13 +1,13 @@
 package jsonrpclib
 
-import weaver._
-import jsonrpclib.internals._
+import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
 import com.github.plokhotnyuk.jsoniter_scala.core._
+import io.circe.syntax._
+import io.circe.Json
+import jsonrpclib.internals._
 import jsonrpclib.CallId.NumberId
 import jsonrpclib.OutputMessage.ResponseMessage
-import io.circe.Json
-import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
-import io.circe.syntax._
+import weaver._
 
 object RawMessageSpec extends FunSuite {
   test("json parsing with null result") {
diff --git a/modules/core/src/test/scalajvm-native/jsonrpclib/internals/HeaderSpec.scala b/modules/core/src/test/scalajvm-native/jsonrpclib/internals/HeaderSpec.scala
@@ -1,11 +1,12 @@
 package jsonrpclib.internals
 
+import jsonrpclib.ProtocolError
 import weaver._
-import java.io.ByteArrayInputStream
+
 import java.io.BufferedReader
-import java.io.InputStreamReader
-import jsonrpclib.ProtocolError
+import java.io.ByteArrayInputStream
 import java.io.IOException
+import java.io.InputStreamReader
 import java.io.UncheckedIOException
 
 object HeaderSpec extends FunSuite {
diff --git a/modules/examples/client/src/main/scala/examples/client/ClientMain.scala b/modules/examples/client/src/main/scala/examples/client/ClientMain.scala
@@ -2,13 +2,13 @@ package examples.client
 
 import cats.effect._
 import cats.syntax.all._
-import io.circe.Codec
-import io.circe.generic.semiauto._
-import fs2.Stream
 import fs2.io._
 import fs2.io.process.Processes
-import jsonrpclib.CallId
+import fs2.Stream
+import io.circe.generic.semiauto._
+import io.circe.Codec
 import jsonrpclib.fs2._
+import jsonrpclib.CallId
 
 object ClientMain extends IOApp.Simple {
 
diff --git a/modules/examples/server/src/main/scala/examples/server/ServerMain.scala b/modules/examples/server/src/main/scala/examples/server/ServerMain.scala
@@ -1,11 +1,13 @@
 package examples.server
 
-import jsonrpclib.CallId
-import jsonrpclib.fs2._
 import cats.effect._
 import fs2.io._
-import io.circe.{Decoder, Encoder, Codec}
 import io.circe.generic.semiauto._
+import io.circe.Codec
+import io.circe.Decoder
+import io.circe.Encoder
+import jsonrpclib.fs2._
+import jsonrpclib.CallId
 import jsonrpclib.Endpoint
 
 object ServerMain extends IOApp.Simple {
diff --git a/modules/examples/smithyClient/src/main/scala/examples/smithy/client/ClientMain.scala b/modules/examples/smithyClient/src/main/scala/examples/smithy/client/ClientMain.scala
@@ -2,12 +2,12 @@ package examples.smithy.client
 
 import cats.effect._
 import cats.syntax.all._
+import fs2.io.process.Processes
 import fs2.Stream
-import jsonrpclib.CallId
 import jsonrpclib.fs2._
 import jsonrpclib.smithy4sinterop.ClientStub
 import jsonrpclib.smithy4sinterop.ServerEndpoints
-import fs2.io.process.Processes
+import jsonrpclib.CallId
 import test._
 
 object SmithyClientMain extends IOApp.Simple {
diff --git a/modules/examples/smithyServer/src/main/scala/examples/smithy/server/ServerMain.scala b/modules/examples/smithyServer/src/main/scala/examples/smithy/server/ServerMain.scala
@@ -1,12 +1,12 @@
 package examples.smithy.server
 
-import jsonrpclib.CallId
-import jsonrpclib.fs2._
 import cats.effect._
 import fs2.io._
-import test._ // smithy4s-generated package
+import jsonrpclib.fs2._
 import jsonrpclib.smithy4sinterop.ClientStub
 import jsonrpclib.smithy4sinterop.ServerEndpoints
+import jsonrpclib.CallId
+import test._ // smithy4s-generated package
 
 object ServerMain extends IOApp.Simple {
 
diff --git a/modules/fs2/src/main/scala/jsonrpclib/fs2/FS2Channel.scala b/modules/fs2/src/main/scala/jsonrpclib/fs2/FS2Channel.scala
@@ -1,22 +1,23 @@
 package jsonrpclib
 package fs2
 
-import _root_.fs2.Pipe
-import _root_.fs2.Stream
+import cats.effect.kernel._
+import cats.effect.std.Supervisor
+import cats.effect.syntax.all._
+import cats.effect.Fiber
+import cats.syntax.all._
 import cats.Applicative
 import cats.Functor
 import cats.Monad
 import cats.MonadThrow
-import cats.effect.Fiber
-import cats.effect.kernel._
-import cats.effect.std.Supervisor
-import cats.syntax.all._
-import cats.effect.syntax.all._
-import jsonrpclib.internals.MessageDispatcher
 import io.circe.Codec
+import jsonrpclib.internals.MessageDispatcher
 
-import scala.util.Try
 import java.util.regex.Pattern
+import scala.util.Try
+
+import _root_.fs2.Pipe
+import _root_.fs2.Stream
 
 trait FS2Channel[F[_]] extends Channel[F] {
 
diff --git a/modules/fs2/src/main/scala/jsonrpclib/fs2/lsp.scala b/modules/fs2/src/main/scala/jsonrpclib/fs2/lsp.scala
@@ -1,21 +1,23 @@
 package jsonrpclib.fs2
 
 import cats.MonadThrow
+import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
+import com.github.plokhotnyuk.jsoniter_scala.core._
 import fs2.Chunk
-import fs2.Stream
 import fs2.Pipe
+import fs2.Stream
+import io.circe.Decoder
+import io.circe.Encoder
+import io.circe.HCursor
+import io.circe.Json
+import jsonrpclib.Message
 import jsonrpclib.Payload
-import io.circe.{Encoder, Decoder, HCursor}
+import jsonrpclib.ProtocolError
+
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
-import jsonrpclib.Message
-import jsonrpclib.ProtocolError
 import scala.annotation.tailrec
 
-import com.github.plokhotnyuk.jsoniter_scala.core._
-import com.github.plokhotnyuk.jsoniter_scala.circe.JsoniterScalaCodec._
-import io.circe.Json
-
 object lsp {
 
   def encodeMessages[F[_]]: Pipe[F, Message, Byte] =
diff --git a/modules/fs2/src/main/scala/jsonrpclib/fs2/package.scala b/modules/fs2/src/main/scala/jsonrpclib/fs2/package.scala
@@ -1,10 +1,11 @@
 package jsonrpclib
 
-import _root_.fs2.Stream
-import cats.MonadThrow
-import cats.Monad
-import cats.effect.kernel.Resource
 import cats.effect.kernel.MonadCancel
+import cats.effect.kernel.Resource
+import cats.Monad
+import cats.MonadThrow
+
+import _root_.fs2.Stream
 
 package object fs2 {
 
diff --git a/modules/fs2/src/test/scala/jsonrpclib/fs2/FS2ChannelSpec.scala b/modules/fs2/src/test/scala/jsonrpclib/fs2/FS2ChannelSpec.scala
@@ -3,10 +3,10 @@ package jsonrpclib.fs2
 import cats.effect.IO
 import cats.syntax.all._
 import fs2.Stream
+import io.circe.generic.semiauto._
+import io.circe.Codec
 import jsonrpclib._
 import weaver._
-import io.circe.Codec
-import io.circe.generic.semiauto._
 
 import scala.concurrent.duration._
 
diff --git a/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/CirceJsonCodec.scala b/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/CirceJsonCodec.scala
@@ -1,11 +1,10 @@
 package jsonrpclib.smithy4sinterop
 
-import smithy4s.Document
-import smithy4s.Schema
+import io.circe._
 import smithy4s.codecs.PayloadPath
-
+import smithy4s.Document
 import smithy4s.Document.{Decoder => _, _}
-import io.circe._
+import smithy4s.Schema
 
 object CirceJsonCodec {
 
diff --git a/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/ClientStub.scala b/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/ClientStub.scala
@@ -1,12 +1,12 @@
 package jsonrpclib.smithy4sinterop
 
-import smithy4s.~>
-import smithy4s.Service
-import smithy4s.schema._
-import smithy4s.ShapeId
 import io.circe.Codec
 import jsonrpclib.Channel
 import jsonrpclib.Monadic
+import smithy4s.~>
+import smithy4s.schema._
+import smithy4s.Service
+import smithy4s.ShapeId
 
 object ClientStub {
 
diff --git a/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/ServerEndpoints.scala b/modules/smithy4s/src/main/scala/jsonrpclib/smithy4sinterop/ServerEndpoints.scala
@@ -1,17 +1,18 @@
 package jsonrpclib.smithy4sinterop
 
-import _root_.smithy4s.{Endpoint => Smithy4sEndpoint}
+import io.circe.Codec
 import jsonrpclib.Endpoint
-import smithy4s.Service
-import smithy4s.kinds.FunctorAlgebra
-import smithy4s.kinds.FunctorInterpreter
-import jsonrpclib.Monadic
-import jsonrpclib.Payload
+import jsonrpclib.ErrorEncoder
 import jsonrpclib.ErrorPayload
-import io.circe.Codec
+import jsonrpclib.Monadic
 import jsonrpclib.Monadic.syntax._
-import jsonrpclib.ErrorEncoder
+import jsonrpclib.Payload
+import smithy4s.kinds.FunctorAlgebra
+import smithy4s.kinds.FunctorInterpreter
 import smithy4s.schema.ErrorSchema
+import smithy4s.Service
+
+import _root_.smithy4s.{Endpoint => Smithy4sEndpoint}
 
 object ServerEndpoints {
 
diff --git a/modules/smithy4sTests/src/test/scala/jsonrpclib/smithy4sinterop/TestClientSpec.scala b/modules/smithy4sTests/src/test/scala/jsonrpclib/smithy4sinterop/TestClientSpec.scala
diff --git a/modules/smithy4sTests/src/test/scala/jsonrpclib/smithy4sinterop/TestServerSpec.scala b/modules/smithy4sTests/src/test/scala/jsonrpclib/smithy4sinterop/TestServerSpec.scala
