ScalafmtConfig: use Sbt dialect for .sbt files

Apply this default unless another dialect, different from the primary one, was explicitly specified through `fileOverride`.
scalameta · Feb 23, 2024 · 8bb934c · 8bb934c
1 parent 5262eb1
commit 8bb934c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala
@@ -4,6 +4,7 @@ import java.nio.file.Path
 
 import metaconfig.Configured
 import scala.meta.Input
+import scala.meta.dialects
 import scala.meta.parsers.ParseException
 import scala.util.Failure
 import scala.util.Success
@@ -12,6 +13,7 @@ import scala.util.Try
 import org.scalafmt.Error.PreciseIncomplete
 import org.scalafmt.config.FormatEvent.CreateFormatOps
 import org.scalafmt.config.LineEndings
+import org.scalafmt.config.NamedDialect
 import org.scalafmt.config.ScalafmtConfig
 import org.scalafmt.internal.BestFirstSearch
 import org.scalafmt.internal.FormatOps
@@ -65,7 +67,11 @@ object Scalafmt {
   ): Formatted.Result = {
     def getStyleByFile(style: ScalafmtConfig) = {
       val isSbt = FileOps.isSbt(filename)
-      if (isSbt) style.forSbt else style
+      if (isSbt) {
+        val sbtStyle = style.forSbt
+        if (sbtStyle.dialect ne baseStyle.dialect) sbtStyle
+        else sbtStyle.withDialect(NamedDialect(dialects.Sbt))
+      } else style
     }
     val styleTry =
       if (filename == defaultFilename) Success(baseStyle)

diff --git a/scalafmt-tests/src/test/resources/scala3/Issues.stat b/scalafmt-tests/src/test/resources/scala3/Issues.stat
@@ -114,5 +114,6 @@ lazy val versions = new {
   val cats = "2.10.0"
 }
 >>> build.sbt
-lazy val versions = new:
+lazy val versions = new {
   val cats = "2.10.0"
+}