From 01cd4091afd3c2cbf76511c15d75f4c901b8b1c0 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Fri, 27 Dec 2024 17:54:46 -0800 Subject: [PATCH] NamedDialect: add `scala36` as a supported version --- docs/configuration.md | 21 ++++++++++++------- .../org/scalafmt/config/NamedDialect.scala | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index b9b132b7f4..f1a4242ce2 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -113,14 +113,19 @@ used to select it. Available dialects are: -- `scala211` -- `scala212` -- `scala212source3` -- `scala213` -- `scala213source3` -- `scala3` -- `sbt0137` -- `sbt1` +- Scala 2 + - `scala211` + - `scala212` + - `scala212source3` + - `scala213` + - `scala213source3` +- Scala 3 + - `scala3`: most recent release + - `Scala3Future`: scala3 plus experimental, unreleased features + - specific versions from `Scala30` to `Scala36` +- sbt-specific + - `sbt0137` + - `sbt1` You can also specify `runner.dialect` for a subset of files using [fileOverride](#fileoverride): 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 index b6acbf5b6c..3b55174a25 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/NamedDialect.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/NamedDialect.scala @@ -34,6 +34,7 @@ object NamedDialect { Scala33, Scala34, Scala35, + Scala36, ).map(apply).sortBy(_.name) private[config] val defaultName = "default"