FormatWriter: replace single-line mlc with slc

scalameta · Dec 26, 2021 · 9b5ada7 · 9b5ada7
1 parent e7f4857
commit 9b5ada7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 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
@@ -723,8 +723,12 @@ class FormatWriter(formatOps: FormatOps) {
           val contents = text.substring(2).trim
           val wordIter = splitAsIterator(slcDelim)(contents)
           sb.append(if (useSlc) "//" else "/*")
-          iterWords(wordIter, appendLineBreak, getFirstLineLength)
-          if (!useSlc) sb.append(" */")
+          val curlen = sb.length
+          val lines = iterWords(wordIter, appendLineBreak, getFirstLineLength)
+          if (!useSlc)
+            if (lines == 0 && style.comments.wrapSingleLineMlcAsSlc)
+              sb.setCharAt(curlen - 1, '/')
+            else sb.append(" */")
         }
       }
 
@@ -773,8 +777,11 @@ class FormatWriter(formatOps: FormatOps) {
               }
             }
             sb.append("/*")
-            iterSections(sectionIter, getFirstLineLength)
-            sb.append(" */")
+            val curlen = sb.length
+            val lines = iterSections(sectionIter, getFirstLineLength)
+            if (lines == 0 && style.comments.wrapSingleLineMlcAsSlc)
+              sb.setCharAt(curlen - 1, '/')
+            else sb.append(" */")
           } else {
             val trimmed = removeTrailingWhiteSpace(text)
             sb.append(leadingAsteriskSpace.matcher(trimmed).replaceAll(spaces))

diff --git a/scalafmt-tests/src/test/resources/unit/Comment.stat b/scalafmt-tests/src/test/resources/unit/Comment.stat
@@ -415,7 +415,7 @@ object a {
 }
 >>>
 object a {
-  /* mlc */ /* foo bar */
+  /* mlc */ // foo bar
 }
 <<< wrap with empty first line 2
 comments.wrap = trailing
@@ -438,7 +438,7 @@ object a {
 }
 >>>
 object a {
-  /* mlc */ /* foo bar */
+  /* mlc */ // foo bar
 }
 <<< #2043
 object a {