ScalafmtConfig: fix withoutRewrites trailingCommas

scalameta · Oct 3, 2023 · 84c9f26 · 84c9f26
1 parent 3adc085
commit 84c9f26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RewriteSettings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RewriteSettings.scala
@@ -16,6 +16,9 @@ case class RewriteSettings(
     allowInfixPlaceholderArg: Boolean = true,
     neverInfix: Pattern = Pattern.neverInfix
 ) {
+  def withoutRewrites: RewriteSettings =
+    copy(rules = Nil, trailingCommas = trailingCommas.withoutRewrites)
+
   def rewriteFactoryRules: Seq[RewriteFactory] =
     rules.collect { case x: RewriteFactory => x }
 

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
@@ -250,7 +250,7 @@ case class ScalafmtConfig(
   // used in ScalafmtReflectConfig
   def withoutRewrites: ScalafmtConfig = copy(
     trailingCommas = None,
-    rewrite = RewriteSettings.default
+    rewrite = rewrite.withoutRewrites
   )
 
   lazy val forceNewlineBeforeDocstring: Boolean =

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/TrailingCommas.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/TrailingCommas.scala
@@ -5,7 +5,9 @@ import metaconfig._
 case class TrailingCommas(
     allowFolding: Boolean = true,
     style: TrailingCommas.Style = TrailingCommas.never
-)
+) {
+  def withoutRewrites: TrailingCommas = copy(style = TrailingCommas.keep)
+}
 
 object TrailingCommas {
 

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/config/ScalafmtConfigTest.scala b/scalafmt-tests/src/test/scala/org/scalafmt/config/ScalafmtConfigTest.scala
@@ -92,7 +92,7 @@ class ScalafmtConfigTest extends FunSuite {
       .get
     assert(config1.hasRewrites)
     val config2 = config1.withoutRewrites
-    assert(config2.hasRewrites) // XXX: this is incorrect
+    assert(!config2.hasRewrites)
   }
 
   test("hasRewriteRules-and-withoutRewriteRules docstrings") {