FormatOps: simplify functionExpire

scalameta · Mar 16, 2024 · adf6c79 · adf6c79
1 parent 7460512
commit adf6c79
Showing 1 changed file with 2 additions and 18 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
@@ -921,29 +921,13 @@ class FormatOps(
     maxPrecedence
   }
 
-  def functionExpire(function: Term.FunctionTerm): (T, ExpiresOn) = {
-    def dropWS(rtoks: Seq[T]): Seq[T] =
-      rtoks.dropWhile(_.is[T.Whitespace])
-    def orElse(rtoks: Seq[T]) = {
-      val last = rtoks.head
-      if (last.is[T.RightParen] && matchingOpt(last).contains(rtoks.last))
-        rtoks.tail.find(!_.is[T.Whitespace]).get -> ExpiresOn.After
-      else
-        last -> ExpiresOn.After
-    }
-    def dropComment(rtoks: Seq[T]) =
-      if (rtoks.head.is[T.Comment]) dropWS(rtoks.tail) else rtoks
-
-    def getRToks = dropWS(function.tokens.reverse)
+  def functionExpire(function: Term.FunctionTerm): (T, ExpiresOn) =
     function.parent match {
       case Some(SingleArgInBraces.OrBlock(_, _, e)) =>
         e.left -> ExpiresOn.Before
-      case Some(Case(_, _, `function`)) =>
-        orElse(dropComment(getRToks))
       case _ =>
-        orElse(getRToks)
+        tokens.getLastExceptParen(function).left -> ExpiresOn.After
     }
-  }
 
   def noOptimizationZones(): Set[T] = {
     val result = Set.newBuilder[T]