Router: make sure to indent comments after lambda

scalameta · Jun 10, 2023 · 9a43b69 · 9a43b69
1 parent f758be4
commit 9a43b69
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -910,8 +910,8 @@ class FormatOps(
 
     def getRToks = dropWS(function.tokens.reverse)
     function.parent match {
-      case Some(b @ Term.Block(_ :: Nil)) =>
-        getLastToken(b) -> ExpiresOn.Before
+      case Some(Term.Block(_ :: Nil)) =>
+        getLastNonTrivialToken(function) -> ExpiresOn.Before
       case Some(Case(_, _, `function`)) =>
         orElse(dropComment(getRToks))
       case _ =>

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -284,7 +284,17 @@ class Router(formatOps: FormatOps) {
                 ) None
                 else Some(false)
               val indents =
-                Nil
+                if (nlOnly.contains(false)) {
+                  val beforeClose = tokens.prevNonCommentBefore(closeFT).right
+                  if (beforeClose eq close) Nil
+                  else {
+                    val indent = style.indent.main
+                    List(
+                      Indent(indent, close, Before),
+                      Indent(-indent, beforeClose, Before)
+                    )
+                  }
+                } else Nil
               (expire, arrow.map(_.left), indents, nlOnly)
             case Some(t: Case) if t.cond.isEmpty && (leftOwner match {
                   case Term.PartialFunction(`t` :: Nil) => true

diff --git a/scalafmt-tests/src/test/resources/default/Lambda.stat b/scalafmt-tests/src/test/resources/default/Lambda.stat
@@ -487,6 +487,6 @@ object a {
 object a {
   And("foo") { () =>
     baz
-  // bar
+    // bar
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -487,6 +487,6 @@ object a { @@
     object a {
       And("foo") { () =>
         baz
-      // bar
+        // bar
       }
     }