ScalafmtConfig: restore withDialect overload

scalameta · Sep 13, 2021 · 38850f6 · 38850f6
1 parent 9a53bce
commit 38850f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
@@ -145,14 +145,16 @@ case class ScalafmtConfig(
       k -> v.getMatcher
     }
 
-  def withDialect(dialect: ScalafmtRunner.Dialect.WithName): ScalafmtConfig =
+  private[scalafmt] def withNamedDialect(
+      dialect: ScalafmtRunner.Dialect.WithName
+  ): ScalafmtConfig =
     copy(runner = runner.copy(dialect = dialect))
 
-  def withDialect(
-      dialect: Dialect,
-      name: String = "unknown dialect"
-  ): ScalafmtConfig =
-    withDialect(ScalafmtRunner.Dialect.withName(name, dialect))
+  def withNamedDialect(dialect: Dialect, name: String): ScalafmtConfig =
+    withNamedDialect(ScalafmtRunner.Dialect.withName(name, dialect))
+
+  def withDialect(dialect: Dialect): ScalafmtConfig =
+    withNamedDialect(dialect, "unknown dialect")
 
   def forSbt: ScalafmtConfig = copy(runner = runner.forSbt)
 

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala b/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala
@@ -150,12 +150,14 @@ trait HasTests extends FormatAssertions {
       case "unit" => HasTests.unitTest40
       case "default" | "standard" | "scala" => HasTests.unitTest80
       case "scalajs" =>
-        ScalafmtConfig.scalaJs.copy(maxColumn = 79).withDialect(defaultDialect)
+        ScalafmtConfig.scalaJs
+          .copy(maxColumn = 79)
+          .withNamedDialect(defaultDialect)
       case "scala3" =>
         ScalafmtConfig.default
-          .withDialect(ScalafmtRunner.Dialect.scala3, "scala3")
+          .withNamedDialect(ScalafmtRunner.Dialect.scala3, "scala3")
       case _ =>
-        ScalafmtConfig.default.withDialect(defaultDialect)
+        ScalafmtConfig.default.withNamedDialect(defaultDialect)
     }
 
   def saveResult(t: DiffTest, obtained: String, debug: Debug): Result = {