Merge pull request #2731 from pdelvo/morefixall

Add two more fix all providers

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/DocumentationRules/FileHeaderCodeFixProvider.cs

@@ -47,7 +47,7 @@ internal class FileHeaderCodeFixProvider : CodeFixProvider
         /// <inheritdoc/>
         public override FixAllProvider GetFixAllProvider()
         {
-            return CustomFixAllProviders.BatchFixer;
+            return FixAll.Instance;
         }
 
         /// <inheritdoc/>
@@ -67,6 +67,11 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         }
 
         private static async Task<Document> GetTransformedDocumentAsync(Document document, CancellationToken cancellationToken)
+        {
+            return document.WithSyntaxRoot(await GetTransformedSyntaxRootAsync(document, cancellationToken).ConfigureAwait(false));
+        }
+
+        private static async Task<SyntaxNode> GetTransformedSyntaxRootAsync(Document document, CancellationToken cancellationToken)
         {
             var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var settings = document.Project.AnalyzerOptions.GetStyleCopSettings(cancellationToken);
@@ -96,7 +101,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
                 }
             }
 
-            return document.WithSyntaxRoot(newSyntaxRoot);
+            return newSyntaxRoot;
         }
 
         private static SyntaxNode ReplaceWellFormedMultiLineCommentHeader(Document document, SyntaxNode root, StyleCopSettings settings, int commentIndex, XmlFileHeader header)
@@ -460,5 +465,22 @@ private static SyntaxTriviaList RemoveHeaderDecorationLines(SyntaxTriviaList tri
 
             return trivia;
         }
+
+        private class FixAll : DocumentBasedFixAllProvider
+        {
+            public static FixAllProvider Instance { get; } = new FixAll();
+
+            protected override string CodeActionTitle => DocumentationResources.SA1633CodeFix;
+
+            protected override Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+            {
+                if (diagnostics.IsEmpty)
+                {
+                    return null;
+                }
+
+                return GetTransformedSyntaxRootAsync(document, fixAllContext.CancellationToken);
+            }
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1517CodeFixProvider.cs

@@ -27,7 +27,7 @@ internal class SA1517CodeFixProvider : CodeFixProvider
         /// <inheritdoc/>
         public override FixAllProvider GetFixAllProvider()
         {
-            return CustomFixAllProviders.BatchFixer;
+            return FixAll.Instance;
         }
 
         /// <inheritdoc/>
@@ -47,6 +47,13 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         }
 
         private static async Task<Document> GetTransformedDocumentAsync(Document document, CancellationToken token)
+        {
+            var newSyntaxRoot = await GetTransformedSyntaxRootAsync(document, token).ConfigureAwait(false);
+
+            return document.WithSyntaxRoot(newSyntaxRoot);
+        }
+
+        private static async Task<SyntaxNode> GetTransformedSyntaxRootAsync(Document document, CancellationToken token)
         {
             var syntaxRoot = await document.GetSyntaxRootAsync(token).ConfigureAwait(false);
 
@@ -66,9 +73,26 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
 
             var newFirstToken = firstToken.WithLeadingTrivia(newTriviaList);
             var newSyntaxRoot = syntaxRoot.ReplaceToken(firstToken, newFirstToken);
-            var newDocument = document.WithSyntaxRoot(newSyntaxRoot);
+            return newSyntaxRoot;
+        }
+
+        private class FixAll : DocumentBasedFixAllProvider
+        {
+            public static FixAllProvider Instance { get; } =
+                new FixAll();
 
-            return newDocument;
+            protected override string CodeActionTitle =>
+                LayoutResources.SA1517CodeFix;
+
+            protected override Task<SyntaxNode> FixAllInDocumentAsync(FixAllContext fixAllContext, Document document, ImmutableArray<Diagnostic> diagnostics)
+            {
+                if (diagnostics.IsEmpty)
+                {
+                    return null;
+                }
+
+                return GetTransformedSyntaxRootAsync(document, fixAllContext.CancellationToken);
+            }
         }
     }
 }