Router: handle empty return type (procedure decl)

scalameta · Apr 18, 2022 · 0263c75 · 0263c75
1 parent eef7156
commit 0263c75
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -1542,7 +1542,8 @@ class Router(formatOps: FormatOps) {
               case Some(ft @ FormatToken(_, _: T.Comma, _)) if oneline => ft
               case Some(FormatToken(_, _: T.RightParen, _))
                   if style.newlines.avoidInResultType =>
-                defDefReturnType(leftOwner).fold(lastFT)(getLastNonTrivial)
+                val rt = defDefReturnType(leftOwner) // could be empty tree
+                rt.flatMap(tokens.getLastNonTrivialOpt).getOrElse(lastFT)
               case _ => lastFT
             }
             val nlPolicy = (if (oneline) nextCommaOrParen else None) match {