FormatWriter: implement align.delayUntilSpace

docs/configuration.md

@@ -951,8 +951,9 @@ Apart from a few special cases, the way alignment works is as follows:
 - for each token that has matches in the surrounding lines:
   - we'll determine the amount of extra space needed to be added _before_
     that token, to align it _on the right_ with matching tokens
-  - however, if there was no space before the token, that extra space will be
-    added to the next space on its line, aligning subsequent token _on the left_.
+  - however, if there was no space before the token, and `align.delayUntilSpace`
+    is set, that extra space will be added to the next space on its line, thus
+    aligning subsequent token _on the left_.
 
 Align has several nested fields, which you can customize. However, it comes with
 four possible presets: none, some, more, & most.
@@ -1441,6 +1442,48 @@ object a {
 }
 ```
 
+### `align.delayUntilSpace`
+
+If this flag is set, the formatter will not forcefully pull apart two successive
+non-whitespace tokens that would otherwise be formatted without a space between
+them.
+
+Instead, the extra alignment spaces will be added to the next space on the same line.
+
+> Since v3.7.13. Prior to that, this behaviour was always enabled.
+
+```scala mdoc:defaults
+align.delayUntilSpace
+```
+
+```scala mdoc:scalafmt
+align.preset = more
+align.delayUntilSpace = true
+align.tokens."+" = [ { code = ":" }, { code = "(" }, { code = ")" }, { code = "=" } ]
+---
+object a {
+  def meeethod1(pram1: AnyRef): Any = ???
+  def methd2(paaaaaram2: Any): Any = ???
+  def meth3(param333333: Any): Any = ???
+  def md4(param4: Any): Any = ???
+}
+```
+
+vs
+
+```scala mdoc:scalafmt
+align.preset = more
+align.delayUntilSpace = false
+align.tokens."+" = [ { code = ":" }, { code = "(" }, { code = ")" }, { code = "=" } ]
+---
+object a {
+  def meeethod1(pram1: AnyRef): Any = ???
+  def methd2(paaaaaram2: Any): Any = ???
+  def meth3(param333333: Any): Any = ???
+  def md4(param4: Any): Any = ???
+}
+```
+
 ## Newlines
 
 The `newlines.*` options are used to configure when and where `scalafmt` should

scalafmt-core/shared/src/main/scala/org/scalafmt/config/Align.scala

@@ -63,6 +63,7 @@ import metaconfig.generic.Surface
   */
 case class Align(
     allowOverflow: Boolean = false,
+    delayUntilSpace: Boolean = true,
     multiline: Boolean = false,
     stripMargin: Boolean = true,
     closeParenSite: Boolean = false,

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala

@@ -457,7 +457,7 @@ class FormatWriter(formatOps: FormatOps) {
 
           case p: Provided => p.betweenText
 
-          case NoSplit =>
+          case NoSplit if style.align.delayUntilSpace =>
             return delayedAlign + currentAlign // RETURNING!
 
           case _ => getIndentation(mod.length + currentAlign + delayedAlign)

scalafmt-tests/src/test/resources/align/DefaultWithAlign.stat

@@ -2054,8 +2054,9 @@ object a {
   def meth3(     param333333: Any    ): Any = ???
   def md4(       param4:      Any    ): Any = ???
 }
-<<< #3614 !spaces.inParentheses
+<<< #3614 !spaces.inParentheses align.delayUntilSpace
 spaces.inParentheses = false
+align.delayUntilSpace = true
 align.tokens."+" = [ { code = ":" }, { code = "(" }, { code = ")" }, { code = "=" } ]
 ===
 object a {
@@ -2071,3 +2072,21 @@ object a {
   def meth3(param333333:     Any):    Any = ???
   def md4(param4:            Any):    Any = ???
 }
+<<< #3614 !spaces.inParentheses !align.delayUntilSpace
+spaces.inParentheses = false
+align.delayUntilSpace = false
+align.tokens."+" = [ { code = ":" }, { code = "(" }, { code = ")" }, { code = "=" } ]
+===
+object a {
+  def meeethod1(pram1: AnyRef): Any = ???
+  def methd2(paaaaaram2: Any): Any = ???
+  def meth3(param333333: Any): Any = ???
+  def md4(param4: Any): Any = ???
+}
+>>>
+object a {
+  def meeethod1(pram1      : AnyRef): Any = ???
+  def methd2   (paaaaaram2 : Any   ): Any = ???
+  def meth3    (param333333: Any   ): Any = ???
+  def md4      (param4     : Any   ): Any = ???
+}