Scalameta: upgrade to v4.5.5

Contains a few parsing fixes around scala3 functionality backported to scala2, and parens in infix expressions.
scalameta · May 13, 2022 · eb797c3 · eb797c3
1 parent 62fbc76
commit eb797c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 
 object Dependencies {
   val metaconfigV = "0.10.0"
-  val scalametaV  = "4.5.4"
+  val scalametaV  = "4.5.5"
   val scalacheckV = "1.15.4"
   val coursier    = "1.0.3"
   val munitV      = "0.7.29"

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
@@ -1941,7 +1941,7 @@ class Router(formatOps: FormatOps) {
       // If/For/While/For with (
       case FormatToken(open: T.LeftParen, _, _) if (leftOwner match {
             case _: Term.If | _: Term.While | _: Term.For | _: Term.ForYield =>
-              !isSuperfluousParenthesis(open, leftOwner)
+              !isFirstToken(open, leftOwner)
             case _ => false
           }) =>
         val close = matching(open)

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
@@ -422,7 +422,7 @@ object TreeOps {
       isSuperfluousParenthesis(open.asInstanceOf[LeftParen], owner)
 
   def isSuperfluousParenthesis(open: LeftParen, owner: Tree): Boolean =
-    !isTuple(owner) && owner.tokens.headOption.contains(open)
+    !isTuple(owner) && isFirstToken(open, owner)
 
   @inline
   def isFirstOrLastToken(token: Token, owner: Tree): Boolean =