From 60f9699d0b7b10a1ee8923bb3bc47d8039f0b5a3 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:38:52 -0800 Subject: [PATCH] Router: optimization, check brace then matching --- .../src/main/scala/org/scalafmt/internal/Router.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 index a149b854a9..47163903d8 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala @@ -892,11 +892,10 @@ class Router(formatOps: FormatOps) { else getNoSplitAfterOpening(ft, commentNL = null) def multilineSpaceSplit(implicit fileLine: FileLine): Split = { - val lambdaLeft: Option[FT] = - matchingOptLeft(functionExpire(lambda)._1) match { - case x @ Some(FT(_: T.LeftBrace, _, _)) => x - case _ => None - } + val lambdaLeft: Option[FT] = functionExpire(lambda)._1 match { + case x @ FT(_: T.RightBrace, _, _) => matchingOptLeft(x) + case _ => None + } val arrowFt = getFuncArrow(lambda).get val lambdaIsABlock = lambdaLeft.exists(_.left eq arrowFt.right)