Scalameta: upgrade to v4.12.6

scalameta · Jan 15, 2025 · ca1cdf1 · ca1cdf1
1 parent c366f34
commit ca1cdf1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -8,7 +8,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
 object Dependencies {
   val metaconfigV = "0.14.0"
-  val scalametaV  = "4.12.4.1"
+  val scalametaV  = "4.12.6"
   val scalacheckV = "1.18.1"
   val coursier    = "2.1.10"
   val munitV      = "1.0.2"

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
@@ -948,7 +948,21 @@ class FormatWriter(formatOps: FormatOps) {
               word.length == 2 && word(1) == '.' && "1aiI".contains(word(0))
 
           val wf = new WordFormatter(appendBreak, termIndent, likeNonText)
-          val words = text.parts.iterator.map(_.syntax)
+          val wordIter = text.parts.iterator.buffered
+          val words = wordIter.map { info =>
+            val text = info.part.syntax
+            wordIter.headOption match {
+              case Some(next) if next.attachedToPrevious =>
+                val partsb = new StringBuilder()
+                partsb.append(text)
+                while ({ // poor man's do-while
+                  partsb.append(wordIter.next().part.syntax)
+                  wordIter.headOption.exists(_.attachedToPrevious)
+                }) {}
+                partsb.result()
+              case _ => text
+            }
+          }
           val lineLength = math.max(lineLengthSoFar, termIndent.length)
           wf(words, lineLength, lineLengthSoFar == 0, false)
           appendBreak()

diff --git a/scalafmt-tests/shared/src/test/resources/test/JavaDoc.stat b/scalafmt-tests/shared/src/test/resources/test/JavaDoc.stat
@@ -3565,16 +3565,16 @@ object a
 /**
  * Options:
  *   - foo`bar`s
- *   - foo `bar` s
- *   - foo `bar` 's
+ *   - foo `bar`s
+ *   - foo `bar`'s
  *   - foo(`bar`)
  *   - foo (`bar`)
  *   - foo[[bar]]baz
  *   - foo [[bar]]s
  *   - foo([[bar]])
  *   - foo ([[bar]])
  *   - foo{{{bar}}}baz
- *   - foo {{{bar}}} s
+ *   - foo {{{bar}}}s
  *   - foo({{{bar}}})
  *   - foo ({{{bar}}})
  */