scalafmt: enable SortModifiers with styleGuide

scalameta · Mar 31, 2024 · 3b7b561 · 3b7b561
1 parent da8534d
commit 3b7b561
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -14,6 +14,12 @@ align {
 newlines {
   avoidForSimpleOverflow = [punct, slc, tooLong]
 }
+rewrite {
+  rules = [
+    SortModifiers,
+  ]
+  sortModifiers.preset = styleGuide
+}
 # Disabled in default since this operation is potentially
 # dangerous if you define your own stripMargin with different
 # semantics from the stdlib stripMargin.

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/FormatEvent.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/FormatEvent.scala
@@ -8,7 +8,7 @@ import org.scalafmt.internal.State
 
 /** An event that happens while formatting a file.
   */
-abstract sealed class FormatEvent
+sealed abstract class FormatEvent
 
 object FormatEvent {
   case class CreateFormatOps(formatOps: FormatOps) extends FormatEvent

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala
@@ -166,7 +166,7 @@ object ProjectFiles {
       private[config] val s213 = nd(NamedDialect.scala213)
       private[config] val s3 = nd(NamedDialect.scala3)
 
-      protected[config] override def getDialectByLang(lang: String)(implicit
+      override protected[config] def getDialectByLang(lang: String)(implicit
           dialect: Dialect
       ): Option[NamedDialect] = lang match {
         case "scala-2.10" if is211 => s210