Merge pull request #2741 from vweijsters/fix-2740

Fixed SA1129 code fix for CancellationToken as default parameter

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1129CodeFixProvider.cs

@@ -70,7 +70,14 @@ private static SyntaxNode GetReplacementNode(SyntaxNode node, SemanticModel sema
 
             if (IsType<CancellationToken>(namedTypeSymbol))
             {
-                replacement = ConstructMemberAccessSyntax(newExpression.Type, nameof(CancellationToken.None));
+                if (IsDefaultParameterValue(newExpression))
+                {
+                    replacement = SyntaxFactory.DefaultExpression(newExpression.Type);
+                }
+                else
+                {
+                    replacement = ConstructMemberAccessSyntax(newExpression.Type, nameof(CancellationToken.None));
+                }
             }
             else if (IsEnumWithDefaultMember(namedTypeSymbol, out memberName))
             {
@@ -117,6 +124,16 @@ private static bool IsType<T>(INamedTypeSymbol namedTypeSymbol)
             return true;
         }
 
+        private static bool IsDefaultParameterValue(ObjectCreationExpressionSyntax expression)
+        {
+            if (expression.Parent.Parent is ParameterSyntax parameterSyntax)
+            {
+                return parameterSyntax.Parent.Parent is BaseMethodDeclarationSyntax;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Determines whether a given enumeration symbol contains a member with value <c>0</c>.
         /// </summary>

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1129UnitTests.cs

@@ -526,6 +526,53 @@ private enum MyEnum {{ {declarationBody} }}
             await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
         }
 
+        /// <summary>
+        /// Verifies that <c>new CancellationToken()</c> is replaced by <c>default(CancellationToken)</c> when its used for a default parameter.
+        /// </summary>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        [WorkItem(2740, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2740")]
+        public async Task VerifyCancellationTokenDefaultParameterAsync()
+        {
+            var testCode = @"using System.Threading;
+
+public class TestClass
+{
+    public TestClass(CancellationToken cancellationToken = new CancellationToken())
+    {
+    }
+
+    public void TestMethod(CancellationToken cancellationToken = new CancellationToken())
+    {
+    }
+}
+";
+
+            var fixedTestCode = @"using System.Threading;
+
+public class TestClass
+{
+    public TestClass(CancellationToken cancellationToken = default(CancellationToken))
+    {
+    }
+
+    public void TestMethod(CancellationToken cancellationToken = default(CancellationToken))
+    {
+    }
+}
+";
+
+            DiagnosticResult[] expected =
+            {
+                this.CSharpDiagnostic().WithLocation(5, 60),
+                this.CSharpDiagnostic().WithLocation(9, 66),
+            };
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(fixedTestCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedTestCode).ConfigureAwait(false);
+        }
+
         /// <inheritdoc/>
         protected override IEnumerable<DiagnosticAnalyzer> GetCSharpDiagnosticAnalyzers()
         {