Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SortSettings: create a variable for each modifier #3793

Merged
merged 1 commit into from
Feb 23, 2024
Merged

SortSettings: create a variable for each modifier #3793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 42 additions & 18 deletions scalafmt-core/shared/src/main/scala/org/scalafmt/config/SortSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import metaconfig._
import scala.meta.Mod
import sourcecode.Text

import scala.meta.classifiers.Classifier

case class SortSettings(
order: List[SortSettings.ModKey]
)
Expand All @@ -14,24 +16,46 @@ object SortSettings {
matches: Mod => Boolean
)

val defaultOrder: List[ModKey] = List(
ModKey("implicit", _.is[Mod.Implicit]),
//
ModKey("final", _.is[Mod.Final]),
ModKey("sealed", _.is[Mod.Sealed]),
ModKey("abstract", _.is[Mod.Abstract]),
//
ModKey("override", _.is[Mod.Override]),
//
ModKey("private", _.is[Mod.Private]),
ModKey("protected", _.is[Mod.Protected]),
//
ModKey("lazy", _.is[Mod.Lazy]),
ModKey("open", _.is[Mod.Open]),
ModKey("transparent", _.is[Mod.Transparent]),
ModKey("inline", _.is[Mod.Inline]),
ModKey("infix", _.is[Mod.Infix]),
ModKey("opaque", _.is[Mod.Opaque])
object ModKey {
def apply[A](name: String)(implicit
classifier: Classifier[Mod, A]
): ModKey =
ModKey(name, _.is[A])
}

private val modImplicit = ModKey[Mod.Implicit]("implicit")
private val modFinal = ModKey[Mod.Final]("final")
private val modSealed = ModKey[Mod.Sealed]("sealed")
private val modAbstract = ModKey[Mod.Abstract]("abstract")
private val modOverride = ModKey[Mod.Override]("override")
private val modPrivate = ModKey[Mod.Private]("private")
private val modProtected = ModKey[Mod.Protected]("protected")
private val modLazy = ModKey[Mod.Lazy]("lazy")
private val modOpen = ModKey[Mod.Open]("open")
private val modTransparent = ModKey[Mod.Transparent]("transparent")
private val modInline = ModKey[Mod.Inline]("inline")
private val modInfix = ModKey[Mod.Infix]("infix")
private val modOpaque = ModKey[Mod.Opaque]("opaque")

private val defaultOrder: List[ModKey] = List(
// implicit
modImplicit,
// final
modFinal,
modSealed,
modAbstract,
// override
modOverride,
// access
modPrivate,
modProtected,
// other
modLazy,
modOpen,
modTransparent,
modInline,
modInfix,
modOpaque
)

implicit val sortSettingsModKeyCodec: ConfCodecEx[ModKey] =
Expand Down
Loading