Skip to content

Commit

Permalink
fix/fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
kitlangton committed May 3, 2024
1 parent 32cf7a2 commit 6d37fde
Show file tree
Hide file tree
Showing 22 changed files with 72 additions and 49 deletions.
8 changes: 5 additions & 3 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
rules = [
OrganizeImports,
RemoveUnused,
# RemoveUnused,
RedundantSyntax,
NoValInForComprehension
]

RemoveUnused.imports = false
OrganizeImports.targetDialect = Scala3
# RemoveUnused.imports = false
OrganizeImports.targetDialect = Scala3
OrganizeImports.removeUnused = false

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package neotype

import scala.quoted.*

import StringFormatting.*

private[neotype] object ErrorMessages:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package neotype

import scala.annotation.implicitNotFound
import scala.annotation.tailrec
import scala.quoted.*
import scala.annotation.{implicitNotFound, tailrec}

@implicitNotFound("${A} has a `validate` method")
trait IsSimpleType[A]
Expand Down
11 changes: 9 additions & 2 deletions modules/core/shared/src/main/scala/neotype/Macros.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package neotype

import neotype.eval.Eval
import neotype.eval.EvalError
import neotype.eval.Seal
import neotype.eval.Uninlined
import neotype.eval.Unseal

import scala.quoted.*
import scala.util.{Failure, Success}
import scala.util.Failure
import scala.util.Success

import StringFormatting.*
import neotype.eval.{Unseal, Eval, Seal, Uninlined, EvalError}

private[neotype] object Macros:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package neotype.eval

import scala.quoted.*
import scala.annotation.nowarn
import scala.quoted.*

object CustomFromExpr:
given fromExprSet[A]: FromExpr[Set[A]] with
Expand Down
8 changes: 4 additions & 4 deletions modules/core/shared/src/main/scala/neotype/eval/Eval.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package neotype.eval

import BinOpMatch.*

import neotype.StringFormatting.*

import scala.quoted.*
import scala.util.matching.Regex

import BinOpMatch.*
import CustomFromExpr.given
// import neotype.eval.Eval.closureToFunction

Expand Down Expand Up @@ -222,10 +222,10 @@ object Eval:
case c: Char => s"'$c'".green
case set: Set[?] =>
val elems = set.map(renderValue).mkString(", ".reset)
s"Set(".reset + elems + ")".reset
"Set(".reset + elems + ")".reset
case list: List[?] =>
val elems = list.map(renderValue).mkString(", ".reset)
s"List(".reset + elems + ")".reset
"List(".reset + elems + ")".reset
case regex: Regex =>
s"""${renderValue(regex.toString)}.r"""
case long: Long => s"${long}L".cyan
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package neotype

import scala.quoted.*
import zio.test.*

import scala.compiletime.summonInline
import scala.compiletime.testing.*
import scala.quoted.*

object NewtypeSpec extends ZIOSpecDefault:
val spec = suiteAll("NewtypeSpec") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package neotype.test

import zio.test.*
import neotype.test.definitions.*
import zio.test.*

trait JsonLibrary[Codec[_]]:
def decode[A](json: String)(using codec: Codec[A]): Either[String, A]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package neotype.circe

import neotype.*
import io.circe.*
import neotype.*

// Newtype
given [A, B](using newType: Newtype.WithType[A, B], decoder: Decoder[A]): Decoder[B] =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package neotype.circe

import neotype.{Newtype, Subtype}
import zio.test.*
import io.circe.*
import io.circe.parser.*
import neotype.Newtype
import neotype.Subtype
import neotype.test.definitions.*
import zio.test.*

object CirceJsonSpec extends ZIOSpecDefault:
def spec = suite("CirceJsonSpec")(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package neotype.jsoniter

import com.github.plokhotnyuk.jsoniter_scala.core.{JsonReader, JsonValueCodec, JsonWriter}
import com.github.plokhotnyuk.jsoniter_scala.macros.{JsonCodecMaker, CodecMakerConfig}
import com.github.plokhotnyuk.jsoniter_scala.core.JsonReader
import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
import com.github.plokhotnyuk.jsoniter_scala.core.JsonWriter
import com.github.plokhotnyuk.jsoniter_scala.macros.CodecMakerConfig
import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
import neotype.*

// Newtype
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package neotype.jsoniter

import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
import com.github.plokhotnyuk.jsoniter_scala.core.readFromString
import com.github.plokhotnyuk.jsoniter_scala.macros.CodecMakerConfig
import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
import neotype.*
import zio.test.*
import zio.*
import com.github.plokhotnyuk.jsoniter_scala.core.{JsonValueCodec, readFromString}
import com.github.plokhotnyuk.jsoniter_scala.macros.{CodecMakerConfig, JsonCodecMaker}
import neotype.jsoniter.given
import neotype.test.definitions.*
import zio.*
import zio.test.*

import scala.util.Try
import neotype.test.definitions.*

object JsoniterSpec extends ZIOSpecDefault:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package neotype.tapir

import neotype.*
import sttp.tapir.Schema
import sttp.tapir.Validator
import sttp.tapir.ValidationResult
import sttp.tapir.Codec
import sttp.tapir.DecodeResult
import sttp.tapir.CodecFormat
import sttp.tapir.DecodeResult
import sttp.tapir.Schema
import sttp.tapir.ValidationResult
import sttp.tapir.Validator
import sttp.tapir.json.pickler.*

// Newtype
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package neotype.tapir

import zio.test.*
import neotype.Newtype
import neotype.Subtype
import sttp.tapir.Schema
import neotype.test.definitions.*
import sttp.tapir.Codec
import sttp.tapir.DecodeResult
import sttp.tapir.DecodeResult.Error.JsonDecodeException
import sttp.tapir.Schema
import sttp.tapir.json.pickler.Pickler
import zio.test.*
import zio.test.Assertion.*
import neotype.test.definitions.*

object TapirSpec extends ZIOSpecDefault:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package neotype.zioconfig

import neotype.*
import zio.Chunk
import zio.Config
import zio.config.*
import zio.config.magnolia.*
import zio.Config
import zio.Chunk

given validatedNewtype[A, B](using
newtype: Newtype.WithType[A, B],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package neotype.zioconfig

import neotype.*
import zio.test.*
import neotype.test.definitions.*
import zio.ConfigProvider
import zio.config.*
import zio.config.magnolia.*
import zio.ConfigProvider
import neotype.test.definitions.*
import zio.test.*

object ZioConfigSpec extends ZIOSpecDefault:
def spec = suite("zio-config")(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package neotype.ziojson

import zio.test.*
import zio.json.*
import neotype.*
import zio.json.*
import zio.test.*

type Sandwich = Sandwich.Type
object Sandwich extends Newtype[String]:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package neotype.zioquill

import neotype.*
import io.getquill
import io.getquill.MappedEncoding
import neotype.*

// Newtype
inline given [A, B](using newType: Newtype.WithType[A, B]): MappedEncoding[A, B] =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package neotype.zioquill

import io.getquill.*
import neotype.Newtype
import neotype.Subtype
import neotype.test.definitions.*
import neotype.{Newtype, Subtype}
import zio.test.*

object Queries:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
package neotype.zioschema

import neotype.{Newtype, Subtype}
import neotype.Newtype
import neotype.Subtype
import neotype.test.definitions.*
import zio.*
import zio.json.*
import zio.json.DeriveJsonEncoder
import zio.json.JsonEncoder
import zio.schema.DeriveSchema
import zio.schema.Schema
import zio.schema.codec.DecodeError
import zio.schema.codec.DecodeError.ReadError
import zio.schema.codec.JsonCodec
import zio.schema.codec.JsonCodec.JsonDecoder
import zio.schema.codec.JsonCodec.JsonEncoder.charSequenceToByteChunk
import zio.schema.codec.{DecodeError, JsonCodec}
import zio.schema.{DeriveSchema, Schema}
import zio.stream.ZStream
import zio.test.*
import zio.test.Assertion.*
import zio.json.{DeriveJsonEncoder, JsonEncoder}
import zio.json.*

import java.nio.CharBuffer
import java.nio.charset.StandardCharsets
import neotype.test.definitions.*

object ZioSchemaSpec extends ZIOSpecDefault:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package neotype.ziotest

import neotype.*
import _root_.zio.test.*
import neotype.*
import zio.test.magnolia.DeriveGen

// Newtype.Simple
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package neotype.ziotest

import neotype.{Newtype, Subtype}
import zio.test.*
import neotype.Newtype
import neotype.Subtype
import neotype.test.definitions.*
import zio.*
import zio.test.*
import zio.test.magnolia.DeriveGen
import neotype.test.definitions.*

object ZioSpec extends ZIOSpecDefault:

Expand Down

0 comments on commit 6d37fde

Please sign in to comment.