Scalameta: upgrade to v4.6.0

scalameta · Sep 30, 2022 · f94b1e1 · f94b1e1
1 parent ca35ecf
commit f94b1e1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 
 object Dependencies {
   val metaconfigV = "0.11.1"
-  val scalametaV  = "4.5.13"
+  val scalametaV  = "4.6.0"
   val scalacheckV = "1.17.0"
   val coursier    = "1.0.3"
   val munitV      = "0.7.29"

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/NamedDialect.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/NamedDialect.scala
@@ -26,6 +26,7 @@ object NamedDialect {
     Scala213Source3,
     Sbt0137,
     Sbt1,
+    Scala3Future,
     scala3
   ).map(apply).sortBy(_.name)
 

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/SortModifiers.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/SortModifiers.scala
@@ -32,20 +32,9 @@ class SortModifiers(implicit ctx: RewriteCtx) extends RewriteSession {
        * }}}
        * are considered Mods, instead of being similar to `Defn.Val`, or `Defn.Var`.
        */
-      case d: Decl.Def => sortMods(d.mods)
-      case v: Decl.Val => sortMods(v.mods)
-      case v: Decl.Var => sortMods(v.mods)
-      case t: Decl.Type => sortMods(t.mods)
-      case t: Decl.Given => sortMods(t.mods)
-      case d: Defn.Def => sortMods(d.mods)
-      case d: Defn.Given => sortMods(d.mods)
-      case d: Defn.GivenAlias => sortMods(d.mods)
-      case v: Defn.Val => sortMods(v.mods)
-      case v: Defn.Var => sortMods(v.mods)
-      case t: Defn.Type => sortMods(t.mods)
       case c: Defn.Class => sortMods(c.mods.filterNot(_.is[Mod.Case]))
       case o: Defn.Object => sortMods(o.mods.filterNot(_.is[Mod.Case]))
-      case t: Defn.Trait => sortMods(t.mods)
+      case s: Stat.WithMods => sortMods(s.mods)
       case p: Term.Param =>
         val start = p.pos.start
         sortMods(p.mods.filterNot { m =>

diff --git a/scalafmt-tests/src/test/resources/unit/Type.stat b/scalafmt-tests/src/test/resources/unit/Type.stat
@@ -123,7 +123,7 @@ object O {
   class t(arg: OptionT[Either[Int, -*]])
 }
 <<< #3319
-runner.dialect = scala3
+runner.dialect = scala3Future
 maxColumn = 80
 ===
 object O{