FormatWriter: fold long oneline javadoc if no wrap

scalameta · Jun 18, 2020 · 3074f39 · 3074f39
1 parent a5e1951
commit 3074f39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
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
@@ -406,7 +406,8 @@ class FormatWriter(formatOps: FormatOps) {
           }) && {
             val content = matcher.group(2)
             val folding = // 7 is the length of "/** " and " */"
-              content.length <= style.maxColumn - prevState.indentation - 7
+              content.length <= style.maxColumn - prevState.indentation - 7 ||
+                (style.docstrings.wrap eq Docstrings.Wrap.no)
             if (folding) sb.append("/** ").append(content).append(" */")
             folding
           }

diff --git a/scalafmt-tests/src/test/resources/test/JavaDoc.stat b/scalafmt-tests/src/test/resources/test/JavaDoc.stat
@@ -1236,12 +1236,8 @@ object a {
 >>>
 object a {
 
-  /**
-   * alias for [[literal]]
-   */
-  /**
-   * alias for [[literal]]
-   */
+  /** alias for [[literal]] */
+  /** alias for [[literal]] */
 }
 <<< #2028 Asterisk long, keep, !wrap
 docstrings.style = Asterisk
@@ -1260,10 +1256,6 @@ object a {
 >>>
 object a {
 
-  /**
-   * alias for [[literal]]
-   */
-  /**
-   * alias for [[literal]]
-   */
+  /** alias for [[literal]] */
+  /** alias for [[literal]] */
 }