Router: use spaces.afterColonInMatchPattern

scalameta · Jun 20, 2024 · 2654a0e · 2654a0e
1 parent 4dab474
commit 2654a0e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Spaces.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Spaces.scala
@@ -66,6 +66,17 @@ case class Spaces(
 ) {
   def isSpaceAfterKeyword(tokenAfter: Token): Boolean =
     afterKeywordBeforeParen || !tokenAfter.is[Token.LeftParen]
+
+  def notAfterColon(owner: meta.Tree): Boolean = owner match {
+    case x: meta.Pat.Typed => afterColonInMatchPattern match {
+        case Spaces.AfterColonInMatchPattern.Never => true
+        case Spaces.AfterColonInMatchPattern.Always => false
+        case Spaces.AfterColonInMatchPattern.NoAlternatives => x.parent
+            .exists(_.is[meta.Pat.Alternative])
+      }
+    case _ => false
+  }
+
 }
 
 object Spaces {

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
@@ -2366,6 +2366,8 @@ class Router(formatOps: FormatOps) {
       case FormatToken(T.RightArrow(), _, _) if leftOwner.is[Type.ByName] =>
         val mod = Space(style.spaces.inByNameTypes)
         Seq(Split(mod, 0))
+      case FormatToken(_: T.Colon, _, _)
+          if style.spaces.notAfterColon(leftOwner) => Seq(Split(NoSplit, 0))
       case FormatToken(_: T.Symbolic, _, _) => Seq(Split(Space, 0))
       case tok =>
         logger.debug(s"MISSING CASE: $tok")

diff --git a/scalafmt-tests/src/test/resources/unit/Case.stat b/scalafmt-tests/src/test/resources/unit/Case.stat
@@ -129,8 +129,8 @@ foo match {
 }
 >>>
 foo match {
-  case e: Etype | f: Ftype =>
-  case g: Gtype =>
+  case e:Etype | f:Ftype =>
+  case g:Gtype =>
 }
 <<< pattern alternatives, afterColonInMatchPattern = noAlternatives
 spaces.afterColonInMatchPattern = noAlternatives
@@ -141,6 +141,6 @@ foo match {
 }
 >>>
 foo match {
-  case e: Etype | f: Ftype =>
+  case e:Etype | f:Ftype =>
   case g: Gtype =>
 }