Improve Normalize Whitespace for block lambdas (#46661)

dotnet · Aug 17, 2020 · 1919454 · 1919454
1 parent e69b451
commit 1919454
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs b/src/Compilers/CSharp/Portable/Syntax/SyntaxNormalizer.cs
@@ -282,7 +282,8 @@ private static int LineBreaksAfterOpenBrace(SyntaxToken currentToken, SyntaxToke
         private static int LineBreaksAfterCloseBrace(SyntaxToken currentToken, SyntaxToken nextToken)
         {
             if (currentToken.Parent is InitializerExpressionSyntax ||
-                currentToken.Parent.IsKind(SyntaxKind.Interpolation))
+                currentToken.Parent.IsKind(SyntaxKind.Interpolation) ||
+                currentToken.Parent?.Parent is AnonymousFunctionExpressionSyntax)
             {
                 return 0;
             }

diff --git a/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs b/src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxNormalizerTests.cs
@@ -565,6 +565,18 @@ public void TestNormalizeTuples()
             TestNormalizeDeclaration("public (string prefix,string uri)Foo()", "public (string prefix, string uri) Foo()");
         }
 
+        [Theory]
+        [InlineData("_=()=>{};", "_ = () =>\r\n{\r\n};")]
+        [InlineData("_=x=>{};", "_ = x =>\r\n{\r\n};")]
+        [InlineData("Add(()=>{});", "Add(() =>\r\n{\r\n});")]
+        [InlineData("Add(delegate(){});", "Add(delegate ()\r\n{\r\n});")]
+        [InlineData("Add(()=>{{_=x=>{};}});", "Add(() =>\r\n{\r\n  {\r\n    _ = x =>\r\n    {\r\n    };\r\n  }\r\n});")]
+        [WorkItem(46656, "https://github.com/dotnet/roslyn/issues/46656")]
+        public void TestNormalizeBlockAnonymousFunctions(string actual, string expected)
+        {
+            TestNormalizeStatement(actual, expected);
+        }
+
         private void TestNormalize(CSharpSyntaxNode node, string expected)
         {
             var actual = node.NormalizeWhitespace("  ").ToFullString();