Router: allow empty parameter list to align

scalameta · Aug 26, 2022 · 94b4571 · 94b4571
1 parent f8e2b84
commit 94b4571
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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
@@ -756,7 +756,7 @@ class Router(formatOps: FormatOps) {
               )
           }
           val argsOpt = if (isAlignFirstParen) getArgsOpt else None
-          argsOpt.map(x => tokens.tokenAfter(x).right).fold(splits) { x =>
+          argsOpt.flatMap(tokens.tokenAfterOpt).map(_.right).fold(splits) { x =>
             val noSplitIndents = Seq(
               Indent(StateColumn, x, ExpiresOn.Before),
               Indent(-indentLen, x, ExpiresOn.Before)
@@ -781,7 +781,7 @@ class Router(formatOps: FormatOps) {
               }
               getSplitsBeforeOpenParen(x, indent, _.beforeOpenParenDefnSite) {
                 rightOwner match {
-                  case SplitDefnIntoParts(_, _, _, args) => Some(args.last)
+                  case SplitDefnIntoParts(_, _, _, args) => args.lastOption
                   case _ => None
                 }
               }

diff --git a/scalafmt-tests/src/test/resources/default/Class.stat b/scalafmt-tests/src/test/resources/default/Class.stat
@@ -562,4 +562,8 @@ object Record {
   final case class NotOk[A]() extends Record[A]
 }
 >>>
-org.scalafmt.util.FormatException: java.util.NoSuchElementException: last of empty list
+object Record {
+  final case class IsOk[A](a: A) extends InvariantADT[A]
+  final case class AlsoOk[A](msg: String) extends InvariantADT[A]
+  final case class NotOk[A]() extends Record[A]
+}