bugfix: When determining indent first check for pipe

Fixes #6798
scalameta · Oct 30, 2024 · bcba920 · bcba920
1 parent 50af2c8
commit bcba920
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/formatting/MultilineString.scala b/metals/src/main/scala/scala/meta/internal/metals/formatting/MultilineString.scala
@@ -60,9 +60,11 @@ case class MultilineString(userConfig: () => UserConfiguration)
     val index =
       if (lineToCheck.contains("\"\"\"|")) {
         lineToCheck.indexOf('"') + 3
+      } else if (lineToCheck.contains("|")) {
+        lineToCheck.indexOf('|')
       } else if (lineToCheck.contains("\"\"\"")) {
         lineToCheck.indexOf('"') + 2
-      } else lineToCheck.indexOf('|')
+      } else 0
     space * index
   }
 

diff --git a/...src/test/scala/tests/rangeFormatting/MultilineStringRangeFormattingWhenPastingSuite.scala b/...src/test/scala/tests/rangeFormatting/MultilineStringRangeFormattingWhenPastingSuite.scala
@@ -339,6 +339,19 @@ class MultilineStringRangeFormattingWhenPastingSuite
        |}""".stripMargin,
   )
 
+  check(
+    "i6798",
+    s"""|val x =
+        |  s'''|Hello
+        |      |Good@@'''.stripMargin
+        |}""".stripMargin,
+    "bye",
+    s"""|val x =
+        |  s'''|Hello
+        |      |Goodbye'''.stripMargin
+        |}""".stripMargin,
+  )
+
   def check(
       name: TestOptions,
       testCase: String,
@@ -358,7 +371,7 @@ class MultilineStringRangeFormattingWhenPastingSuite
           s"""/metals.json
              |{"a":{}}
              |/a/src/main/scala/a/Main.scala
-      """.stripMargin + base
+             |""".stripMargin + base
         )
         _ <- server.didOpen("a/src/main/scala/a/Main.scala")
         _ <- server.rangeFormatting(