diff --git a/scalafmt-tests/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/src/test/resources/newlines/source_classic.stat index 12dfc2535c..72f4bccf30 100644 --- a/scalafmt-tests/src/test/resources/newlines/source_classic.stat +++ b/scalafmt-tests/src/test/resources/newlines/source_classic.stat @@ -2857,7 +2857,44 @@ object a { |}""".stripMargin ) } -<<< binPack with named parameter values, danglingParentheses +<<< binPack with named parameter values, configStyleArguments + danglingParentheses +binPack.preset = true +optIn.configStyleArguments = true +danglingParentheses.callSite = true +=== +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux) + ) + ) +} +>>> +object a { + val foo = bar.map(x => + x.copy( + baz = Option.when(false)(x.qux)) + ) +} +<<< binPack with named parameter values, configStyleArguments + !danglingParentheses +binPack.preset = true +optIn.configStyleArguments = true +danglingParentheses.callSite = false +=== +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux) + ) + ) +} +>>> +object a { + val foo = bar.map(x => + x.copy( + baz = Option.when(false)(x.qux))) +} +<<< binPack with named parameter values, !configStyleArguments + danglingParentheses binPack.preset = true optIn.configStyleArguments = false danglingParentheses.callSite = true @@ -2877,7 +2914,7 @@ object a { ) ) } -<<< binPack with named parameter values, !danglingParentheses +<<< binPack with named parameter values, !configStyleArguments + !danglingParentheses binPack.preset = true optIn.configStyleArguments = false danglingParentheses.callSite = false @@ -2895,7 +2932,45 @@ object a { x.copy( baz = Option.when(false)(x.qux))) } -<<< literalsIncludeSimpleExpr with named parameter values, danglingParentheses +<<< literalsIncludeSimpleExpr with named parameter values, configStyleArguments + danglingParentheses +binPack.literalsIncludeSimpleExpr = true +optIn.configStyleArguments = true +danglingParentheses.callSite = true +=== +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux) + ) + ) +} +>>> +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux) + ) + ) +} +<<< literalsIncludeSimpleExpr with named parameter values, configStyleArguments + !danglingParentheses +binPack.literalsIncludeSimpleExpr = true +optIn.configStyleArguments = true +danglingParentheses.callSite = false +=== +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux) + ) + ) +} +>>> +object a { + val foo = bar.map(x => + x.copy(baz = + Option.when(false)(x.qux))) +} +<<< literalsIncludeSimpleExpr with named parameter values, !configStyleArguments + danglingParentheses binPack.literalsIncludeSimpleExpr = true optIn.configStyleArguments = false danglingParentheses.callSite = true @@ -2915,7 +2990,7 @@ object a { ) ) } -<<< literalsIncludeSimpleExpr with named parameter values, !danglingParentheses +<<< literalsIncludeSimpleExpr with named parameter values, !configStyleArguments + !danglingParentheses binPack.literalsIncludeSimpleExpr = true optIn.configStyleArguments = false danglingParentheses.callSite = false @@ -7492,6 +7567,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7504,6 +7587,12 @@ object Main { 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, @@ -7563,6 +7652,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7570,6 +7667,12 @@ object Main { } >>> object Main { + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar1 = foo1(10000, 10001, 10002 + 0) val bar2 = foo2(0, 1, 2, 3, @@ -7621,6 +7724,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7633,6 +7744,12 @@ object Main { 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, @@ -7692,6 +7809,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7699,6 +7824,12 @@ object Main { } >>> object Main { + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar1 = foo1(10000, 10001, 10002 + 0) val bar2 = foo2(0, 1, 2, 3, diff --git a/scalafmt-tests/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/src/test/resources/newlines/source_fold.stat index 3b6af19870..a14465ef65 100644 --- a/scalafmt-tests/src/test/resources/newlines/source_fold.stat +++ b/scalafmt-tests/src/test/resources/newlines/source_fold.stat @@ -7145,6 +7145,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7152,6 +7160,12 @@ object Main { } >>> object Main { + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar1 = foo1(10000, 10001, 10002 + 0) val bar2 = foo2( @@ -7214,6 +7228,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7221,6 +7243,12 @@ object Main { } >>> object Main { + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar1 = foo1(10000, 10001, 10002 + 0) val bar2 = foo2( @@ -7274,6 +7302,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7281,6 +7317,12 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) val bar1 = foo1( 10000, 10001, 10002 + 0) val bar2 = foo2( @@ -7340,6 +7382,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7347,6 +7397,12 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) val bar1 = foo1( 10000, 10001, 10002 + 0) val bar2 = foo2( diff --git a/scalafmt-tests/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/src/test/resources/newlines/source_keep.stat index 73ccfa3d62..af6309ddc9 100644 --- a/scalafmt-tests/src/test/resources/newlines/source_keep.stat +++ b/scalafmt-tests/src/test/resources/newlines/source_keep.stat @@ -7474,6 +7474,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7485,6 +7493,13 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, @@ -7545,6 +7560,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7556,6 +7579,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1( + 10000, + 10001, 10002 + 0 + ) val bar2 = foo2( 0, 1, 2, 3, @@ -7609,6 +7640,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7620,6 +7659,13 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, @@ -7680,6 +7726,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7687,6 +7741,13 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0) val bar1 = foo1( 10000, 10001, 10002 + 0) diff --git a/scalafmt-tests/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/src/test/resources/newlines/source_unfold.stat index 3d4702e028..1569a30950 100644 --- a/scalafmt-tests/src/test/resources/newlines/source_unfold.stat +++ b/scalafmt-tests/src/test/resources/newlines/source_unfold.stat @@ -7722,6 +7722,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7729,6 +7737,15 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) val bar1 = foo1( 10000, 10001, 10002 + 0 ) @@ -7792,6 +7809,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7799,6 +7824,15 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, 10001, 10002 + 0 + ) val bar1 = foo1( 10000, 10001, 10002 + 0 ) @@ -7853,6 +7887,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7860,6 +7902,12 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) val bar1 = foo1( 10000, 10001, 10002 + 0) val bar2 = foo2( @@ -7920,6 +7968,14 @@ object Main { 10000, 10001, 10002 + 0 ) + val bar1 = foo1(10000, + 10001, 10002 + 0) + val bar1 = foo1(10000, + 10001, 10002 + 0 + ) + val bar1 = foo1( + 10000, + 10001, 10002 + 0) val bar2 = foo2( 0, 1, 2, 3, @@ -7927,6 +7983,12 @@ object Main { } >>> object Main { + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) + val bar1 = foo1( + 10000, 10001, 10002 + 0) val bar1 = foo1( 10000, 10001, 10002 + 0) val bar2 = foo2(