FormatOps: extend slb end past select for keep

scalameta · Sep 27, 2024 · 9bd4ae9 · 9bd4ae9
1 parent ca21bf4
commit 9bd4ae9
Showing 1 changed file with 14 additions and 2 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
@@ -155,8 +155,20 @@ class FormatOps(
           }) => null
       case _: T.RightBracket if start.left.is[T.RightBracket] => null
       case _: T.LeftBracket => null
-      case _: T.Dot if start.rightOwner.is[Type.Select] => null
-      case _: T.Ident if start.leftOwner.is[Type.Select] => null
+      case _: T.Dot => start.rightOwner match {
+          case _: Type.Select => null
+          case _: Term.Select
+              if start.noBreak &&
+                (style.newlines.getSelectChains eq Newlines.keep) => null
+          case _ => start
+        }
+      case _: T.Ident => start.leftOwner match {
+          case _: Type.Select => null
+          case _: Term.Select
+              if start.noBreak &&
+                (style.newlines.getSelectChains eq Newlines.keep) => null
+          case _ => start
+        }
       case t: T.RightParen =>
         if (start.left.is[T.LeftParen]) null
         else {