From 1305c539da132fd1cde5f26ddd2c8f5f5bbb633d Mon Sep 17 00:00:00 2001 From: Timothy Makkison Date: Sun, 19 Oct 2025 21:53:12 +0100 Subject: [PATCH 1/2] fix: comment break indentation of simple lambdas --- .../SimpleLambdaExpression.cs | 2 +- .../TestFiles/cs/SimpleLambdaExpressions.test | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs b/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs index ef60d96fd..77e8bcfd9 100644 --- a/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs +++ b/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs @@ -14,7 +14,7 @@ public static Doc PrintHead(SimpleLambdaExpressionSyntax node, PrintingContext c { return Doc.Concat( Modifiers.PrintSorted(node.Modifiers, context), - Node.Print(node.Parameter, context), + Doc.Group(Node.Print(node.Parameter, context)), " ", Token.Print(node.ArrowToken, context) ); diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test index d3f286637..69231dc35 100644 --- a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test +++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test @@ -136,6 +136,30 @@ public class ClassName return x; }); + this.Where___________________( + x // Comment + => + { + return x; + } + ); + + this.Where___________________( + // Comment + x => + { + return x; + } + ); + + this.Where___________________( + // Comment + () => + { + return 1; + } + ); + this.Where______________________________________( superLongName________________________________ => { From ac45289076e3835f27ef4d4b500285df4fd14fb2 Mon Sep 17 00:00:00 2001 From: Timothy Makkison Date: Sun, 26 Oct 2025 23:22:55 +0000 Subject: [PATCH 2/2] fix: group lambda body --- .../SyntaxNodePrinters/SimpleLambdaExpression.cs | 2 +- .../FormattingTests/TestFiles/cs/MemberChains.test | 3 +-- .../TestFiles/cs/SimpleLambdaExpressions.test | 13 +++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs b/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs index 77e8bcfd9..58f20f8d0 100644 --- a/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs +++ b/Src/CSharpier.Core/CSharp/SyntaxPrinter/SyntaxNodePrinters/SimpleLambdaExpression.cs @@ -29,7 +29,7 @@ public static Doc PrintBody(SimpleLambdaExpressionSyntax node, PrintingContext c " ", Node.Print(node.Body, context) ), - _ => Doc.Indent(Doc.Line, Node.Print(node.Body, context)), + _ => Doc.Group(Doc.Indent(Doc.Line, Node.Print(node.Body, context))), }; } } diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test index efe8ca183..323196c70 100644 --- a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test +++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/MemberChains.test @@ -72,8 +72,7 @@ this.SomeMethod( roleNames .ToList() - .ForEach(role => - this.SomeProperty.Setup(o => longThing_______________________________________) + .ForEach(role => this.SomeProperty.Setup(o => longThing_______________________________________) ); roleNames diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test index 69231dc35..9796413c5 100644 --- a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test +++ b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/SimpleLambdaExpressions.test @@ -113,12 +113,10 @@ public class ClassName || t.OtherLongColumn________________________________ ); - Select______________________________________(superLongName_________________________ => - true + Select______________________________________(superLongName_________________________ => true ); - this.Select_________________________________(selector: static longName_____________ => - true + this.Select_________________________________(selector: static longName_____________ => true ); this.Select_________________________________________( @@ -160,6 +158,13 @@ public class ClassName } ); + this.Where___________________( + // Comment + x => true, + // Comment + x => true + ); + this.Where______________________________________( superLongName________________________________ => {