From 4c1d27219dd57e24abe57962c7cbdd73d66eaef4 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Fri, 11 Aug 2023 11:48:05 +0300 Subject: [PATCH] FormatWriter: implement `align.delayUntilSpace` --- .../main/scala/org/scalafmt/internal/FormatWriter.scala | 2 +- .../src/test/resources/align/DefaultWithAlign.stat | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala index 4e1f775621..9bf80a2871 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala +++ b/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) diff --git a/scalafmt-tests/src/test/resources/align/DefaultWithAlign.stat b/scalafmt-tests/src/test/resources/align/DefaultWithAlign.stat index f0f4866544..6ee343e19b 100644 --- a/scalafmt-tests/src/test/resources/align/DefaultWithAlign.stat +++ b/scalafmt-tests/src/test/resources/align/DefaultWithAlign.stat @@ -2085,8 +2085,8 @@ object a { } >>> object a { - def meeethod1(pram1: AnyRef): Any = ??? - def methd2(paaaaaram2: Any): Any = ??? - def meth3(param333333: Any): Any = ??? - def md4(param4: Any): Any = ??? + def meeethod1(pram1 : AnyRef): Any = ??? + def methd2 (paaaaaram2 : Any ): Any = ??? + def meth3 (param333333: Any ): Any = ??? + def md4 (param4 : Any ): Any = ??? }