Keep trivia in 'make method synchronous'

dotnet · Nov 22, 2024 · 2ae8b34 · 2ae8b34
1 parent 45e24db
commit 2ae8b34
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 70 deletions.
diff --git a/src/Analyzers/CSharp/Tests/MakeMethodSynchronous/MakeMethodSynchronousTests.cs b/src/Analyzers/CSharp/Tests/MakeMethodSynchronous/MakeMethodSynchronousTests.cs
@@ -16,9 +16,10 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MakeMethodSynchronous;
     EmptyDiagnosticAnalyzer,
     CSharpMakeMethodSynchronousCodeFixProvider>;
 
-public class MakeMethodSynchronousTests
+[Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+public sealed class MakeMethodSynchronousTests
 {
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestTaskReturnType()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -44,7 +45,7 @@ void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestTaskOfTReturnType()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -72,7 +73,7 @@ class C
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestSecondModifier()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -98,7 +99,7 @@ public void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestFirstModifier()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -124,7 +125,7 @@ public void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestTrailingTrivia()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -151,7 +152,7 @@ void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestRenameMethod()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -177,7 +178,7 @@ void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestRenameMethod1()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -213,7 +214,7 @@ void Bar()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestParenthesizedLambda()
     {
         var source =
@@ -260,7 +261,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestSimpleLambda()
     {
         var source =
@@ -307,7 +308,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestLambdaWithExpressionBody()
     {
         var source =
@@ -356,7 +357,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestAnonymousMethod()
     {
         var source =
@@ -403,7 +404,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestFixAll()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -443,7 +444,7 @@ void Goo()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCaller1()
     {
@@ -492,7 +493,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCaller2()
     {
@@ -541,7 +542,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCaller3()
     {
@@ -590,7 +591,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCaller4()
     {
@@ -639,7 +640,7 @@ void Goo()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCallerNested1()
     {
@@ -690,7 +691,7 @@ int Goo(int i)
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     [WorkItem("https://github.com/dotnet/roslyn/issues/13961")]
     public async Task TestRemoveAwaitFromCallerNested()
     {
@@ -861,7 +862,7 @@ class C
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithUsingAwait()
     {
         var source =
@@ -890,7 +891,7 @@ async System.Threading.Tasks.Task MAsync()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithUsingNoAwait()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -920,7 +921,7 @@ void M()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithAwaitForEach()
     {
         var source =
@@ -943,7 +944,7 @@ await VerifyCS.VerifyCodeFixAsync(
             source);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithForEachNoAwait()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -971,7 +972,7 @@ void M()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithForEachVariableAwait()
     {
         var source =
@@ -994,7 +995,7 @@ await VerifyCS.VerifyCodeFixAsync(
             source);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task MethodWithForEachVariableNoAwait()
     {
         await VerifyCS.VerifyCodeFixAsync(
@@ -1022,7 +1023,7 @@ void M()
             """);
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestIAsyncEnumerableReturnType()
     {
         var source =
@@ -1060,7 +1061,7 @@ IEnumerable<int> M()
         }.RunAsync();
     }
 
-    [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsMakeMethodSynchronous)]
+    [Fact]
     public async Task TestIAsyncEnumeratorReturnTypeOnLocalFunction()
     {
         var source =

diff --git a/src/Analyzers/CSharp/Tests/RemoveAsyncModifier/RemoveAsyncModifierTests.cs b/src/Analyzers/CSharp/Tests/RemoveAsyncModifier/RemoveAsyncModifierTests.cs
@@ -4,6 +4,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.RemoveAsyncModifier;
+using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Testing;
@@ -17,7 +18,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.RemoveAsyncModifier;
     CSharpRemoveAsyncModifierCodeFixProvider>;
 
 [Trait(Traits.Feature, Traits.Features.CodeActionsRemoveAsyncModifier)]
-public class RemoveAsyncModifierTests : CodeAnalysis.CSharp.Test.Utilities.CSharpTestBase
+public sealed class RemoveAsyncModifierTests
 {
     [Fact]
     public async Task Method_Task_MultipleAndNested()
@@ -917,7 +918,7 @@ public void M1()
     }
 
     [Fact]
-    public async Task ParenthesisedLambda_TaskOfT_ExpressionBody()
+    public async Task ParenthesizedLambda_TaskOfT_ExpressionBody()
     {
         await VerifyCS.VerifyCodeFixAsync(
             """
@@ -947,7 +948,7 @@ public void M1()
     }
 
     [Fact]
-    public async Task ParenthesisedLambda_TaskOfT_BlockBody()
+    public async Task ParenthesizedLambda_TaskOfT_BlockBody()
     {
         await VerifyCS.VerifyCodeFixAsync(
             """
@@ -982,7 +983,7 @@ public void M1()
     }
 
     [Fact]
-    public async Task ParenthesisedLambda_Task_ExpressionBody()
+    public async Task ParenthesizedLambda_Task_ExpressionBody()
     {
         await VerifyCS.VerifyCodeFixAsync(
             """
@@ -1012,7 +1013,7 @@ public void M1()
     }
 
     [Fact]
-    public async Task ParenthesisedLambda_Task_BlockBody()
+    public async Task ParenthesizedLambda_Task_BlockBody()
     {
         await VerifyCS.VerifyCodeFixAsync(
             """
@@ -1163,7 +1164,7 @@ async IAsyncEnumerable<int> M()
                     yield return 1;
                 }
             }
-            """ + AsyncStreamsTypes;
+            """ + CSharpTestBase.AsyncStreamsTypes;
 
         await new VerifyCS.Test
         {
@@ -1207,7 +1208,7 @@ async void M()
     }
 
     [Fact]
-    public async Task ParenthesisedLambda_AsyncVoid_Missing()
+    public async Task ParenthesizedLambda_AsyncVoid_Missing()
     {
         var source = """
             using System;
@@ -1263,4 +1264,37 @@ void M()
             FixedCode = source,
         }.RunAsync();
     }
+    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/65380")]
+    public async Task TestCloseBraceTrivia()
+    {
+        await VerifyCS.VerifyCodeFixAsync(
+            """
+            using System;
+            using System.Threading.Tasks;
+
+            public class Class1
+            {
+                public async Task {|CS1998:Goo|}()
+                {
+                    //Hello 
+                    Console.WriteLine("Goo");
+                    //World
+                }
+            }
+            """,
+            """
+            using System;
+            using System.Threading.Tasks;
+
+            public class Class1
+            {
+                public void Goo()
+                {
+                    //Hello 
+                    Console.WriteLine("Goo");
+                    //World
+                }
+            }
+            """);
+    }
 }
diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
@@ -587,7 +587,7 @@ public void AwaitUnsafeOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter
 }
 ";
 
-        protected static readonly string AsyncStreamsTypes = DisposableAsyncEnumeratorDefinition + CommonAsyncStreamsTypes;
+        public static readonly string AsyncStreamsTypes = DisposableAsyncEnumeratorDefinition + CommonAsyncStreamsTypes;
 
         protected static readonly string EnumeratorCancellationAttributeType = @"
 namespace System.Runtime.CompilerServices