State: use string margin char for interpolations

scalameta · Feb 1, 2022 · 6353943 · 6353943
1 parent 0d2c47d
commit 6353943
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/State.scala
@@ -355,6 +355,14 @@ object State {
           } else identity
           val pipe = getStripMarginChar(ft.meta.rightOwner)
           getColumnsWithStripMargin(pipe, syntax, firstNL, margin, firstLength)
+        case _: Token.Interpolation.Part =>
+          val margin: Int => Int = if (style.assumeStandardLibraryStripMargin) {
+            // 1 for '|'
+            val adjusted = 1 + indent
+            _ => adjusted
+          } else identity
+          val pipe = getStripMarginCharForInterpolate(ft.meta.rightOwner)
+          getColumnsWithStripMargin(pipe, syntax, firstNL, margin, firstLength)
         case _ =>
           val lastNewline = syntax.length - syntax.lastIndexOf('\n') - 1
           (firstLength, lastNewline)

diff --git a/scalafmt-tests/src/test/resources/test/StripMargin.stat b/scalafmt-tests/src/test/resources/test/StripMargin.stat
@@ -482,13 +482,14 @@ class Test {
     }
 }
 >>>
-Idempotency violated
 class Test {
   val test = foo.bar.baz
-    .map(thisvariablenameisreallylong => fr"""UPDATE mytable
-                                             |SET
-                                             | column = $thisvariablenameisreallylong
-                                             |WHERE column2 = ${foo.bar}""".stripMargin.update.run).getOrElse {
+    .map(thisvariablenameisreallylong =>
+      fr"""UPDATE mytable
+          |SET
+          | column = $thisvariablenameisreallylong
+          |WHERE column2 = ${foo.bar}""".stripMargin.update.run
+    ).getOrElse {
       ().pure[ConnectionIO]
     }
 }
@@ -508,13 +509,14 @@ class Test {
     }
 }
 >>>
-Idempotency violated
 class Test {
   val test = foo.bar.baz
-    .map(thisvariablenameisreallylong => fr"""UPDATE mytable
-                                             =SET
-                                             = column = $thisvariablenameisreallylong
-                                             =WHERE column2 = ${foo.bar}""".stripMargin('=').update.run).getOrElse {
+    .map(thisvariablenameisreallylong =>
+      fr"""UPDATE mytable
+          =SET
+          = column = $thisvariablenameisreallylong
+          =WHERE column2 = ${foo.bar}""".stripMargin('=').update.run
+    ).getOrElse {
       ().pure[ConnectionIO]
     }
 }