Merge pull request #4047 from satorg/fix-scalafmt-config

Fix scalafmt config file
typelevel · Nov 18, 2021 · 7c5a211 · 7c5a211
2 parents 26cdba3 + 4f248a3
commit 7c5a211
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -10,4 +10,16 @@ docstrings = JavaDoc
 newlines.afterCurlyLambda = preserve
 docstrings.style = keep
 docstrings.oneline = unfold
-project.excludeFilters = [ "core/src/main/scala-3.x" ]
+
+runner.dialect = scala213source3
+fileOverride {
+  "glob:**/*.sbt" {
+    runner.dialect = sbt1
+  }
+  "glob:**/src/{main,test}/scala-2.12/**" {
+    runner.dialect = scala212source3
+  }
+  "glob:**/src/{main,test}/scala-3.x/**" {
+    runner.dialect = scala3
+  }
+}
diff --git a/core/src/main/scala-3.x/src/main/scala/cats/syntax/MonadOps.scala b/core/src/main/scala-3.x/src/main/scala/cats/syntax/MonadOps.scala
@@ -1,6 +1,6 @@
 package cats.syntax
 
-import cats.{Monad, Alternative}
+import cats.{Alternative, Monad}
 
 final class MonadOps[F[_], A](private val fa: F[A]) extends AnyVal {
   def whileM[G[_]](using M: Monad[F], G: Alternative[G])(p: F[Boolean]): F[G[A]] = M.whileM(p)(fa)

diff --git a/free/src/main/scala-3.x/cats/free/FreeFoldStep.scala b/free/src/main/scala-3.x/cats/free/FreeFoldStep.scala
@@ -1,7 +1,7 @@
 package cats.free
 
 import Free.{FlatMapped, Pure, Suspend}
-import cats.{Foldable, Eval}
+import cats.{Eval, Foldable}
 
 private[free] trait FreeFoldStep[S[_], A] {
 
@@ -38,4 +38,4 @@ private[free] trait FreeFoldStep[S[_], A] {
       fa => F.foldRight(fa, lb)(f),
       [X] => (sx: S[X], g: X => Free[S, A]) => F.foldRight(sx, lb)((a, lbb) => foldRight(g(a), lbb)(f))
     )
-}
+}