Implement CR feedback

Author: pdelvo

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1130CodeFixProvider.cs

@@ -86,9 +86,13 @@ private static SyntaxNode ReplaceWithLambda(AnonymousMethodExpressionSyntax anon
                     .Concat(parameterList.CloseParenToken.LeadingTrivia)
                     .Concat(parameterList.CloseParenToken.TrailingTrivia.WithoutTrailingWhitespace())
                     .Concat(new[] { SyntaxFactory.ElasticSpace });
-                var leadingTrivia = parameterList.OpenParenToken.LeadingTrivia.Concat(parameterList.OpenParenToken.TrailingTrivia);
+                var leadingTrivia = parameterList.OpenParenToken.LeadingTrivia
+                    .Concat(parameterList.OpenParenToken.TrailingTrivia)
+                    .Concat(parameterSyntax.GetLeadingTrivia());
 
-                parameterSyntax = parameterSyntax.WithLeadingTrivia(leadingTrivia).WithTrailingTrivia(trailingTrivia);
+                parameterSyntax = parameterSyntax
+                    .WithLeadingTrivia(leadingTrivia)
+                    .WithTrailingTrivia(trailingTrivia);
 
                 lambdaExpression = SyntaxFactory.SimpleLambdaExpression(anonymousMethod.AsyncKeyword, parameterSyntax, arrowToken, anonymousMethod.Body);
             }
@@ -111,8 +115,9 @@ private static ParameterListSyntax RemoveType(ParameterListSyntax parameterList)
         private static ParameterSyntax RemoveType(ParameterSyntax parameterSyntax)
         {
             var syntax = parameterSyntax.WithType(null)
-                .WithTrailingTrivia(parameterSyntax.Type.GetLeadingTrivia().Concat(parameterSyntax.DescendantTrivia()));
-            return syntax.WithTrailingTrivia(syntax.GetTrailingTrivia().WithoutTrailingWhitespace());
+                .WithLeadingTrivia(parameterSyntax.Type.GetLeadingTrivia().Concat(parameterSyntax.Type.GetTrailingTrivia()));
+            return syntax.WithTrailingTrivia(syntax.GetTrailingTrivia().WithoutTrailingWhitespace())
+                .WithLeadingTrivia(syntax.GetLeadingTrivia().WithoutWhitespace());
         }
 
         private static bool IsValid(ParameterSyntax parameterSyntax)

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1130UnitTests.cs

@@ -252,41 +252,44 @@ private void Method(object o)
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(fixedCode, expectedAfterFix, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedCode, allowNewCompilerDiagnostics: true).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, fixedCode, allowNewCompilerDiagnostics: true, numberOfFixAllIterations: 2).ConfigureAwait(false);
         }
 
         [Fact]
         public async Task TestSimpleDelegateUseWithTriviaAsync()
         {
             var testCode = @"
-using System;
+using System; using System.Collections.Generic;
 public class TypeName
 {
     public void Test()
     {
         Action action1 = /*a*/delegate/*b*/{ };
         Action action2 = /*a*/delegate/*b*/(/*c*/)/*d*/ { };
         Action<int> action3 = /*a*/delegate/*b*/(/*c*/int/*d*/i/*e*/)/*f*/{ };
+        Action<List<int>> action4 = delegate(List</* c1 */ int> i) { };
     }
 }";
 
             string fixedCode = @"
-using System;
+using System; using System.Collections.Generic;
 public class TypeName
 {
     public void Test()
     {
         Action action1 = /*a*/()/*b*/ => { };
         Action action2 = /*a*//*b*/(/*c*/)/*d*/ => { };
-        Action<int> action3 = /*a*//*b*//*c*/i/*d*//*e*//*f*/ => { };
+        Action<int> action3 = /*a*//*b*//*c*//*d*/i/*e*//*f*/ => { };
+        Action<List<int>> action4 = i => { };
     }
 }";
 
             var expected = new[]
             {
                 this.CSharpDiagnostic().WithLocation(7, 31),
                 this.CSharpDiagnostic().WithLocation(8, 31),
-                this.CSharpDiagnostic().WithLocation(9, 36)
+                this.CSharpDiagnostic().WithLocation(9, 36),
+                this.CSharpDiagnostic().WithLocation(10, 37)
             };
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);

StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/CodeFixVerifier.cs

@@ -235,14 +235,11 @@ private static async Task<Document> GetFixAllAnalyzerAsync(FixAllScope scope, Im
                     break;
                 }
 
-                if (numberOfIterations <= 0)
+                if (--numberOfIterations < 0)
                 {
-                    // If we reached 0 we either have not fixed everything we want to fix or the code fix is not supposed to fix all violations.
-                    break;
+                    Assert.True(false, "The upper limit for the number of fix all iterations was exceeded");
                 }
 
-                numberOfIterations--;
-
                 string equivalenceKey = null;
                 foreach (var diagnostic in analyzerDiagnostics)
                 {