ScalafmtConfig: fix withoutRewrites docstrings

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

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Docstrings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Docstrings.scala
@@ -31,6 +31,9 @@ case class Docstrings(
 ) {
   import Docstrings._
 
+  def withoutRewrites: Docstrings =
+    copy(removeEmpty = false, wrap = Wrap.no, style = Preserve)
+
   def skipFirstLineIf(wasBlank: Boolean): Boolean = blankFirstLine match {
     case BlankFirstLine.yes => true
     case BlankFirstLine.no => style.skipFirstLine

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,6 +250,7 @@ case class ScalafmtConfig(
   // used in ScalafmtReflectConfig
   def withoutRewrites: ScalafmtConfig = copy(
     trailingCommas = None,
+    docstrings = docstrings.withoutRewrites,
     rewrite = rewrite.withoutRewrites
   )
 

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
@@ -1013,7 +1013,7 @@ class FormatWriter(formatOps: FormatOps) {
           val codeStyle = style.copy(
             runner = style.runner.forCodeBlock,
             // let's not wrap docstrings, to avoid recursion
-            docstrings = style.docstrings.copy(wrap = Docstrings.Wrap.no),
+            docstrings = style.docstrings.withoutRewrites,
             maxColumn = style.maxColumn - spaces.length - termIndent.length - 1
           )
           Scalafmt.format(code.mkString("\n"), codeStyle) match {

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