Update .scalafmt.conf

.scalafmt.conf

@@ -5,14 +5,10 @@ maxColumn = 120
 continuationIndent.defnSite = 2
 danglingParentheses.preset = true
 rewrite.rules = [SortImports, RedundantBraces, RedundantParens, SortModifiers]
-runner.dialect = Scala213
-fileOverride {
-  "glob:**/src/**/scala-3/**" {
-    runner.dialect = scala3
-    rewrite.scala3.convertToNewSyntax = false
-  }
-}
+runner.dialect = Scala213Source3
+project.layout = StandardConvention
 rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false
 runner.dialectOverride.allowSignificantIndentation = false
 runner.dialectOverride.allowAsForImportRename = false
 runner.dialectOverride.allowStarWildcardImport = false

bench/src/main/scala/monocle/bench/BenchModel.scala

@@ -33,7 +33,7 @@ object BenchModel {
   case class Point3(x: Int, y: Int, z: Int)
   val p = Point3(2, 10, 24)
 
-  val map = SortedMap(1.to(200).map(_ -> 5) *)
+  val map = SortedMap(1.to(200).map(_ -> 5)*)
 
   case class IntWrapper0(i: Int)
   case class IntWrapper1(i: Int)

core/shared/src/main/scala-3/monocle/internal/focus/AppliedFocusImpl.scala

@@ -9,7 +9,7 @@ private[monocle] object AppliedFocusImpl {
     Quotes
   ): Expr[Any] = {
 
-    import quotes.reflect._
+    import quotes.reflect.*
 
     val generatedOptic = FocusImpl(lambda)
 

core/shared/src/main/scala-3/monocle/internal/focus/ComposedFocusImpl.scala

@@ -11,7 +11,7 @@ private[monocle] object ComposedFocusImpl {
     optic: Expr[AnyOptic[S, A]],
     lambda: Expr[Focus.KeywordContext ?=> A => Next]
   )(using Quotes): Expr[Any] = {
-    import quotes.reflect._
+    import quotes.reflect.*
 
     val generatedOptic = FocusImpl(lambda).asTerm
     val opticType      = optic.asTerm.tpe.widen

core/shared/src/main/scala-3/monocle/internal/focus/FocusImpl.scala

@@ -13,7 +13,7 @@ private[focus] class FocusImpl(val macroContext: Quotes)
     with GeneratorLoop
     with AllFeatureGenerators {
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def run[From: Type, To: Type](lambda: Expr[Focus.KeywordContext ?=> From => To]): Expr[Any] = {
     val generatedCode =

core/shared/src/main/scala-3/monocle/internal/focus/LambdaConfigParser.scala

@@ -5,7 +5,7 @@ import scala.quoted.Type
 private[focus] trait LambdaConfigParser {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def parseLambdaConfig[From: Type](lambda: Term): FocusResult[LambdaConfig] = {
     val fromType           = TypeRepr.of[From]

core/shared/src/main/scala-3/monocle/internal/focus/features/GeneratorLoop.scala

@@ -26,7 +26,7 @@ private[focus] trait AllFeatureGenerators
 private[focus] trait GeneratorLoop {
   this: AllFeatureGenerators =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateCode[From: Type](actions: List[FocusAction]): FocusResult[Term] = {
     val idOptic: FocusResult[Term] = Right('{ Iso.id[From] }.asTerm)

core/shared/src/main/scala-3/monocle/internal/focus/features/KeywordParserBase.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait KeywordParserBase extends ParserBase {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   // Marker classes for type safety
   case class Name(name: String)

core/shared/src/main/scala-3/monocle/internal/focus/features/ParserBase.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait ParserBase {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   // Marker class for type safety
   case class RemainingCode(code: Term)

core/shared/src/main/scala-3/monocle/internal/focus/features/ParserLoop.scala

@@ -26,7 +26,7 @@ private[focus] trait AllFeatureParsers
 private[focus] trait ParserLoop {
   this: AllFeatureParsers =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def parseFocusActions(config: LambdaConfig): FocusResult[List[FocusAction]] = {
     def loop(remainingBody: RemainingCode, listSoFar: List[FocusAction]): FocusResult[List[FocusAction]] =

core/shared/src/main/scala-3/monocle/internal/focus/features/SelectParserBase.scala

@@ -5,7 +5,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait SelectParserBase extends ParserBase {
   this: FocusBase =>
 
-  import this.macroContext.reflect._
+  import this.macroContext.reflect.*
 
   // Match on a term that is an instance of a case class
   object CaseClass {

core/shared/src/main/scala-3/monocle/internal/focus/features/as/AsGenerator.scala

@@ -6,7 +6,7 @@ import monocle.internal.AsPrismImpl
 private[focus] trait AsGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateAs(action: FocusAction.KeywordAs): Term = {
     import action.{fromType, toType}

core/shared/src/main/scala-3/monocle/internal/focus/features/at/AtGenerator.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait AtGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateAt(action: FocusAction.KeywordAt): Term = {
     import action.{fromType, toType, index, atInstance}

core/shared/src/main/scala-3/monocle/internal/focus/features/each/EachGenerator.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait EachGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateEach(action: FocusAction.KeywordEach): Term = {
     import action.{fromType, toType, eachInstance}

core/shared/src/main/scala-3/monocle/internal/focus/features/index/IndexGenerator.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.FocusBase
 private[focus] trait IndexGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateIndex(action: FocusAction.KeywordIndex): Term = {
     import action.{fromType, toType, index, indexInstance}

core/shared/src/main/scala-3/monocle/internal/focus/features/selectfield/SelectFieldGenerator.scala

@@ -7,7 +7,7 @@ import scala.quoted.Quotes
 private[focus] trait SelectFieldGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateSelectField(action: FocusAction.SelectField): Term = {
     import action.{fieldName, fromType, fromTypeArgs, toType}

core/shared/src/main/scala-3/monocle/internal/focus/features/selectfield/SelectFieldParser.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.features.SelectParserBase
 private[focus] trait SelectFieldParser {
   this: FocusBase & SelectParserBase =>
 
-  import this.macroContext.reflect._
+  import this.macroContext.reflect.*
 
   object SelectField extends FocusParser {
 

core/shared/src/main/scala-3/monocle/internal/focus/features/selectonlyfield/SelectOnlyFieldGenerator.scala

@@ -7,7 +7,7 @@ import scala.quoted.Quotes
 private[focus] trait SelectOnlyFieldGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateSelectOnlyField(action: FocusAction.SelectOnlyField): Term = {
     import action.{fieldName, fromType, fromTypeArgs, fromCompanion, toType}

core/shared/src/main/scala-3/monocle/internal/focus/features/selectonlyfield/SelectOnlyFieldParser.scala

@@ -6,7 +6,7 @@ import monocle.internal.focus.features.SelectParserBase
 private[focus] trait SelectOnlyFieldParser {
   this: FocusBase & SelectParserBase =>
 
-  import this.macroContext.reflect._
+  import this.macroContext.reflect.*
 
   object SelectOnlyField extends FocusParser {
 

core/shared/src/main/scala-3/monocle/internal/focus/features/some/SomeGenerator.scala

@@ -6,7 +6,7 @@ import monocle.std.option.some
 private[focus] trait SomeGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateSome(action: FocusAction.KeywordSome): Term =
     action.toType.asType match {

core/shared/src/main/scala-3/monocle/internal/focus/features/withdefault/WithDefaultGenerator.scala

@@ -6,7 +6,7 @@ import monocle.std.option.withDefault
 private[focus] trait WithDefaultGenerator {
   this: FocusBase =>
 
-  import macroContext.reflect._
+  import macroContext.reflect.*
 
   def generateWithDefault(action: FocusAction.KeywordWithDefault): Term = {
     import action.{toType, defaultValue}

core/shared/src/main/scala-3/monocle/syntax/ComposedFocusSyntax.scala

@@ -1,6 +1,6 @@
 package monocle.syntax
 
-import monocle._
+import monocle.*
 import monocle.internal.focus.ComposedFocusImpl
 
 trait ComposedFocusSyntax {

core/shared/src/main/scala-3/monocle/syntax/MacroSyntax.scala

@@ -1,6 +1,6 @@
 package monocle.syntax
 
-import monocle._
+import monocle.*
 import monocle.internal.{AsPrism, IsoFields}
 import scala.deriving.Mirror
 

core/shared/src/main/scala/monocle/function/FilterIndex.scala

@@ -88,7 +88,7 @@ object FilterIndex extends FilterIndexFunctions {
               .traverse { case (k, v) =>
                 (if (predicate(k)) f(v) else v.pure[F]).tupleLeft(k)
               }
-              .map(kvs => SortedMap(kvs *)(ok.toOrdering))
+              .map(kvs => SortedMap(kvs*)(ok.toOrdering))
         }
     }
 

core/shared/src/test/scala-3/monocle/focus/AppliedFocusTest.scala

@@ -1,7 +1,7 @@
 package monocle.focus
 
 import monocle.Focus
-import monocle.Focus._
+import monocle.Focus.*
 
 final class AppliedFocusTest extends munit.FunSuite {
 

core/shared/src/test/scala-3/monocle/focus/ComposedFocusTest.scala

@@ -1,7 +1,7 @@
 package monocle.focus
 
-import monocle._
-import monocle.syntax.all._
+import monocle.*
+import monocle.syntax.all.*
 import monocle.syntax.{AppliedGetter, AppliedSetter}
 
 object ComposedFocusTest {
@@ -28,7 +28,7 @@ object ComposedFocusTest {
 
 final class ComposedFocusTest extends munit.FunSuite {
 
-  import ComposedFocusTest._
+  import ComposedFocusTest.*
 
   test("Lens refocus correctly composes Lens") {
     val addressLens: Lens[User, Address] = Focus[User](_.address)

core/shared/src/test/scala-3/monocle/focus/FocusAtTest.scala

@@ -1,7 +1,7 @@
 package monocle.focus
 
 import monocle.Focus
-import monocle.function.At._
+import monocle.function.At.*
 
 final class FocusAtTest extends munit.FunSuite {
 

core/shared/src/test/scala-3/monocle/focus/FocusEachTest.scala

@@ -1,8 +1,8 @@
 package monocle.focus
 
 import monocle.Focus
-import monocle.function.Each._
-import monocle.std.list._
+import monocle.function.Each.*
+import monocle.std.list.*
 
 final class FocusEachTest extends munit.FunSuite {
 

core/shared/src/test/scala-3/monocle/focus/FocusImportTest.scala

@@ -10,12 +10,12 @@ final class FocusImportTest extends munit.FunSuite {
   val user = User("Edith", Some(Address(45, "2120")))
 
   test("import Focus object") {
-    import monocle.Focus._
+    import monocle.Focus.*
     user.focus(_.address.some.streetNumber)
   }
 
   test("import all syntax") {
-    import monocle.syntax.all._
+    import monocle.syntax.all.*
     user.focus(_.address.some.streetNumber)
   }
 

core/shared/src/test/scala-3/monocle/focus/FocusIndexTest.scala

@@ -1,7 +1,7 @@
 package monocle.focus
 
 import monocle.Focus
-import monocle.function.Index._
+import monocle.function.Index.*
 
 final class FocusIndexTest extends munit.FunSuite {
 

core/shared/src/test/scala-3/monocle/focus/FocusSomeTest.scala

@@ -1,7 +1,7 @@
 package monocle.focus
 
 import monocle.Focus
-import monocle.Focus._
+import monocle.Focus.*
 
 final class FocusSomeTest extends munit.FunSuite {
 

core/shared/src/test/scala-3/monocle/internal/IsoFieldsTest.scala

@@ -1,7 +1,7 @@
 package monocle.internal
 
 import monocle.Iso
-import monocle.syntax.all._
+import monocle.syntax.all.*
 
 final class IsoFieldsTest extends munit.FunSuite {
 

law/src/main/scala/monocle/law/discipline/function/AtTests.scala

@@ -13,5 +13,5 @@ object AtTests extends Laws {
     evAt: At[S, I, A],
     arbAA: Arbitrary[A => A]
   ): RuleSet =
-    new SimpleRuleSet("At", LensTests[S, A, I](at(_)).props *)
+    new SimpleRuleSet("At", LensTests[S, A, I](at(_)).props*)
 }

law/src/main/scala/monocle/law/discipline/function/Cons1Tests.scala

@@ -20,6 +20,6 @@ object Cons1Tests extends Laws {
       "Cons1",
       (IsoTests(cons1[S, H, T]).props ++
         LensTests(head[S, H, T]).props ++
-        LensTests(tail[S, H, T]).props) *
+        LensTests(tail[S, H, T]).props)*
     )
 }

law/src/main/scala/monocle/law/discipline/function/ConsTests.scala

@@ -20,6 +20,6 @@ object ConsTests extends Laws {
       "Cons",
       (PrismTests(cons[S, A]).props ++
         OptionalTests(headOption[S, A]).props ++
-        OptionalTests(tailOption[S, A]).props) *
+        OptionalTests(tailOption[S, A]).props)*
     )
 }

law/src/main/scala/monocle/law/discipline/function/EachTests.scala

@@ -10,5 +10,5 @@ import cats.Eq
 
 object EachTests extends Laws {
   def apply[S: Eq: Arbitrary, A: Eq: Arbitrary](implicit evEach: Each[S, A], arbAA: Arbitrary[A => A]): RuleSet =
-    new SimpleRuleSet("Each", TraversalTests(each[S, A]).props *)
+    new SimpleRuleSet("Each", TraversalTests(each[S, A]).props*)
 }

law/src/main/scala/monocle/law/discipline/function/FilterIndexTests.scala

@@ -14,5 +14,5 @@ object FilterIndexTests extends Laws {
     arbAA: Arbitrary[A => A],
     arbIB: Arbitrary[I => Boolean]
   ): RuleSet =
-    new SimpleRuleSet("FilterIndex", TraversalTests(filterIndex(_: I => Boolean)(evFilterIndex)).props *)
+    new SimpleRuleSet("FilterIndex", TraversalTests(filterIndex(_: I => Boolean)(evFilterIndex)).props*)
 }

law/src/main/scala/monocle/law/discipline/function/IndexTests.scala

@@ -13,5 +13,5 @@ object IndexTests extends Laws {
     evIndex: Index[S, I, A],
     arbAA: Arbitrary[A => A]
   ): RuleSet =
-    new SimpleRuleSet("Index", OptionalTests(index(_: I)(evIndex)).props *)
+    new SimpleRuleSet("Index", OptionalTests(index(_: I)(evIndex)).props*)
 }

law/src/main/scala/monocle/law/discipline/function/PossibleTests.scala

@@ -14,5 +14,5 @@ object PossibleTests extends Laws {
     evPossible: Possible[S, A],
     arbAA: Arbitrary[A => A]
   ): RuleSet =
-    new SimpleRuleSet("Possible", OptionalTests(possible[S, A]).props *)
+    new SimpleRuleSet("Possible", OptionalTests(possible[S, A]).props*)
 }

law/src/main/scala/monocle/law/discipline/function/Snoc1Tests.scala

@@ -20,6 +20,6 @@ object Snoc1Tests extends Laws {
       "Snoc1",
       (IsoTests(snoc1[S, I, L]).props ++
         LensTests(init[S, I, L]).props ++
-        LensTests(last[S, I, L]).props) *
+        LensTests(last[S, I, L]).props)*
     )
 }

law/src/main/scala/monocle/law/discipline/function/SnocTests.scala

@@ -20,6 +20,6 @@ object SnocTests extends Laws {
       "Snoc",
       (PrismTests(snoc[S, A]).props ++
         OptionalTests(lastOption[S, A]).props ++
-        OptionalTests(initOption[S, A]).props) *
+        OptionalTests(initOption[S, A]).props)*
     )
 }

macro/src/main/scala-3/monocle/macros/GenPrism.scala

@@ -1,7 +1,7 @@
 package monocle.macros
 
 import monocle.{Focus, Prism}
-import monocle.syntax.all._
+import monocle.syntax.all.*
 
 object GenPrism {
   inline def apply[Source, Target <: Source]: Prism[Source, Target] =

test/shared/src/test/scala/monocle/TestInstances.scala

@@ -63,7 +63,7 @@ trait TestInstances extends PlatformSpecificTestInstances with cats.instances.Al
     Arbitrary(Arbitrary.arbitrary[List[A]].map(_.toVector))
 
   implicit def listMapArbitrary[K: Arbitrary, V: Arbitrary]: Arbitrary[ListMap[K, V]] =
-    Arbitrary(Arbitrary.arbitrary[List[(K, V)]].map(l => ListMap(l *)))
+    Arbitrary(Arbitrary.arbitrary[List[(K, V)]].map(l => ListMap(l*)))
 
   implicit def mapArbitrary[K: Arbitrary, V: Arbitrary]: Arbitrary[Map[K, V]] =
     Arbitrary(Arbitrary.arbitrary[List[(K, V)]].map(_.toMap))