Merge pull request #61129 from DoctorKrolic/generate-parameter-before…

…-cancellation-token Generate parameter before cancellation token in async methods
dotnet · May 4, 2022 · e1f2e7d · e1f2e7d
2 parents 4de4270 + 2b61806
commit e1f2e7d
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 4 deletions.
diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9724,5 +9724,59 @@ void Main()
         var x = [|{keyword}|];
     }}");
         }
+
+        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeCancellationToken_OneParameter()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(System.TimeSpan time, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
+
+        [WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestGenerateParameterBeforeCancellationToken_SeveralParameters()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(string someParameter, CancellationToken cancellationToken)
+    {
+        await Task.Delay([|time|]);
+    }
+}",
+@"using System.Threading;
+using System.Threading.Tasks;
+
+class C
+{
+    public async Task M(string someParameter, System.TimeSpan time, CancellationToken cancellationToken)
+    {
+        await Task.Delay(time);
+    }
+}", index: 4);
+        }
     }
 }
diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/GenerateVariable/GenerateVariableTests.vb
@@ -2990,5 +2990,49 @@ count:=5)
     End Sub
 End Namespace")
         End Function
+
+        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeCancellationToken_OneParameter() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(time As System.TimeSpan, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
+
+        <WorkItem(60842, "https://github.com/dotnet/roslyn/issues/60842")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)>
+        Public Async Function TestGenerateParameterBeforeCancellationToken_SeveralParameters() As Task
+            Await TestInRegularAndScriptAsync(
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(someParameter As String, token As CancellationToken) As Task
+        Await Task.Delay([|time|])
+    End Function
+End Class",
+"Imports System.Threading
+Imports System.Threading.Tasks
+
+Class Test
+    Private Async Function Test(someParameter As String, time As System.TimeSpan, token As CancellationToken) As Task
+        Await Task.Delay(time)
+    End Function
+End Class", index:=4)
+        End Function
     End Class
 End Namespace
diff --git a/...ateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs b/...ateMember/GenerateVariable/AbstractGenerateVariableService.GenerateParameterCodeAction.cs
@@ -17,12 +17,14 @@ private class GenerateParameterCodeAction : CodeAction
             private readonly Document _document;
             private readonly State _state;
             private readonly bool _includeOverridesAndImplementations;
+            private readonly int _parameterIndex;
 
-            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations)
+            public GenerateParameterCodeAction(Document document, State state, bool includeOverridesAndImplementations, int parameterIndex)
             {
                 _document = document;
                 _state = state;
                 _includeOverridesAndImplementations = includeOverridesAndImplementations;
+                _parameterIndex = parameterIndex;
             }
 
             public override string Title
@@ -47,7 +49,7 @@ public override string Title
                     _state.LocalType,
                     RefKind.None,
                     _state.IdentifierToken.ValueText,
-                    newParameterIndex: null,
+                    _parameterIndex,
                     _includeOverridesAndImplementations,
                     cancellationToken).AsNullable();
             }

diff --git a/...Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs b/...Features/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.cs
@@ -210,10 +210,22 @@ private static async Task AddParameterCodeActionsAsync(
                     return;
                 }
 
-                result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false));
+                var containingMethod = state.ContainingMethod;
+                var parameterIndex = containingMethod.Parameters.Length;
+
+                if (containingMethod.Parameters.Length > 0)
+                {
+                    var compilation = await document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
+                    var lastParameterIsCancellationToken = Equals(containingMethod.Parameters.Last().Type, compilation.CancellationTokenType());
+
+                    if (lastParameterIsCancellationToken)
+                        parameterIndex--;
+                }
+
+                result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: false, parameterIndex));
 
                 if (AddParameterService.HasCascadingDeclarations(state.ContainingMethod))
-                    result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: true));
+                    result.Add(new GenerateParameterCodeAction(document, state, includeOverridesAndImplementations: true, parameterIndex));
             }
         }
 

diff --git a/...orkspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs b/...orkspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/ICompilationExtensions.cs
@@ -12,6 +12,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.PooledObjects;
 
@@ -220,5 +221,8 @@ public static ImmutableArray<IAssemblySymbol> GetReferencedAssemblySymbols(this
 
         public static INamedTypeSymbol? DataContractAttribute(this Compilation compilation)
             => compilation.GetTypeByMetadataName(typeof(DataContractAttribute).FullName!);
+
+        public static INamedTypeSymbol? CancellationTokenType(this Compilation compilation)
+            => compilation.GetTypeByMetadataName(typeof(CancellationToken).FullName!);
     }
 }