Merge pull request #60557 from Youssef1313/remove-my-code-actions

Remove some 'MyCodeAction's
dotnet · Apr 5, 2022 · b51d065 · b51d065
2 parents 318d44c + c8876af
commit b51d065
Show file tree

Hide file tree

Showing 70 changed files with 270 additions and 683 deletions.
diff --git a/src/Analyzers/CSharp/CodeFixes/AddBraces/CSharpAddBracesCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/AddBraces/CSharpAddBracesCodeFixProvider.cs
@@ -35,7 +35,10 @@ public override ImmutableArray<string> FixableDiagnosticIds
         public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             context.RegisterCodeFix(
-                new MyCodeAction(c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+                CodeAction.Create(
+                    CSharpAnalyzersResources.Add_braces,
+                    c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                    nameof(CSharpAnalyzersResources.Add_braces)),
                 context.Diagnostics);
 
             return Task.CompletedTask;
@@ -63,13 +66,5 @@ protected override Task FixAllAsync(
 
             return Task.CompletedTask;
         }
-
-        private sealed class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Add_braces, createChangedDocument, CSharpAnalyzersResources.Add_braces)
-            {
-            }
-        }
     }
 }
diff --git a/src/Analyzers/CSharp/CodeFixes/ConvertNamespace/ConvertNamespaceCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/ConvertNamespace/ConvertNamespaceCodeFixProvider.cs
@@ -47,7 +47,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
                 });
 
             context.RegisterCodeFix(
-                new MyCodeAction(title, c => FixAsync(context.Document, diagnostic, c), equivalenceKey),
+                CodeAction.Create(title, c => FixAsync(context.Document, diagnostic, c), equivalenceKey),
                 context.Diagnostics);
 
             return Task.CompletedTask;
@@ -66,13 +66,5 @@ protected override async Task FixAllAsync(
                 editor.OriginalRoot,
                 await converted.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false));
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument, string equivalenceKey)
-                : base(title, createChangedDocument, equivalenceKey)
-            {
-            }
-        }
     }
 }
diff --git a/...s/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.cs b/...s/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionCodeFixProvider.cs
@@ -49,7 +49,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
             }
 
             context.RegisterCodeFix(
-                new MyCodeAction(c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+                CodeAction.Create(
+                    CSharpAnalyzersResources.Convert_switch_statement_to_expression,
+                    c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                    nameof(CSharpAnalyzersResources.Convert_switch_statement_to_expression)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -113,13 +116,5 @@ protected override async Task FixAllAsync(
                 }
             }
         }
-
-        private sealed class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Convert_switch_statement_to_expression, createChangedDocument, nameof(CSharpAnalyzersResources.Convert_switch_statement_to_expression))
-            {
-            }
-        }
     }
 }
diff --git a/src/Analyzers/CSharp/CodeFixes/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs b/src/Analyzers/CSharp/CodeFixes/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs
@@ -49,8 +49,10 @@ public override ImmutableArray<string> FixableDiagnosticIds
 
         public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-            context.RegisterCodeFix(new MyCodeAction(
-                c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+            context.RegisterCodeFix(CodeAction.Create(
+                CSharpAnalyzersResources.Inline_variable_declaration,
+                c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                nameof(CSharpAnalyzersResources.Inline_variable_declaration)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -424,15 +426,5 @@ private static bool TryGetSpeculativeSemanticModel(
             speculativeModel = null;
             return false;
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Inline_variable_declaration,
-                       createChangedDocument,
-                       CSharpAnalyzersResources.Inline_variable_declaration)
-            {
-            }
-        }
     }
 }
diff --git a/...InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessCodeFixProvider.cs b/...InvokeDelegateWithConditionalAccess/InvokeDelegateWithConditionalAccessCodeFixProvider.cs
@@ -40,8 +40,10 @@ protected override bool IncludeDiagnosticDuringFixAll(Diagnostic diagnostic)
 
         public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-            context.RegisterCodeFix(new MyCodeAction(
-                c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+            context.RegisterCodeFix(CodeAction.Create(
+                CSharpAnalyzersResources.Simplify_delegate_invocation,
+                c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                nameof(CSharpAnalyzersResources.Simplify_delegate_invocation)),
                context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -158,13 +160,5 @@ private static T AppendTriviaWithoutEndOfLines<T>(T newStatement, IfStatementSyn
 
             return newStatement.WithTrailingTrivia(expressionTriviaWithoutEndOfLine.Concat(ifStatementTrivia));
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Simplify_delegate_invocation, createChangedDocument, nameof(CSharpAnalyzersResources.Simplify_delegate_invocation))
-            {
-            }
-        }
     }
 }
diff --git a/...Sharp/CodeFixes/MakeStructFieldsWritable/CSharpMakeStructFieldsWritableCodeFixProvider.cs b/...Sharp/CodeFixes/MakeStructFieldsWritable/CSharpMakeStructFieldsWritableCodeFixProvider.cs
@@ -34,8 +34,10 @@ public override ImmutableArray<string> FixableDiagnosticIds
 
         public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-            context.RegisterCodeFix(new MyCodeAction(
-                c => FixAsync(context.Document, context.Diagnostics[0], c)),
+            context.RegisterCodeFix(CodeAction.Create(
+                CSharpAnalyzersResources.Make_readonly_fields_writable,
+                c => FixAsync(context.Document, context.Diagnostics[0], c),
+                nameof(CSharpAnalyzersResources.Make_readonly_fields_writable)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -73,13 +75,5 @@ protected override Task FixAllAsync(
 
             return Task.CompletedTask;
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Make_readonly_fields_writable, createChangedDocument, nameof(CSharpAnalyzersResources.Make_readonly_fields_writable))
-            {
-            }
-        }
     }
 }
diff --git a/...zers/CSharp/CodeFixes/MisplacedUsingDirectives/MisplacedUsingDirectivesCodeFixProvider.cs b/...zers/CSharp/CodeFixes/MisplacedUsingDirectives/MisplacedUsingDirectivesCodeFixProvider.cs
@@ -79,7 +79,10 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
             foreach (var diagnostic in context.Diagnostics)
             {
                 context.RegisterCodeFix(
-                    new MoveMisplacedUsingsCodeAction(token => GetTransformedDocumentAsync(document, compilationUnit, GetAllUsingDirectives(compilationUnit), placement, token)),
+                    CodeAction.Create(
+                        CSharpAnalyzersResources.Move_misplaced_using_directives,
+                        token => GetTransformedDocumentAsync(document, compilationUnit, GetAllUsingDirectives(compilationUnit), placement, token),
+                        nameof(CSharpAnalyzersResources.Move_misplaced_using_directives)),
                     diagnostic);
             }
         }
@@ -426,13 +429,5 @@ private static CompilationUnitSyntax AddFileHeader(CompilationUnitSyntax compila
 
             return compilationUnit.ReplaceToken(firstToken, newFirstToken);
         }
-
-        private class MoveMisplacedUsingsCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MoveMisplacedUsingsCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Move_misplaced_using_directives, createChangedDocument, nameof(CSharpAnalyzersResources.Move_misplaced_using_directives))
-            {
-            }
-        }
     }
 }
diff --git a/.../CodeFixes/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementCodeFixProvider.cs b/.../CodeFixes/NewLines/ConsecutiveBracePlacement/ConsecutiveBracePlacementCodeFixProvider.cs
@@ -37,7 +37,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
             var document = context.Document;
             var diagnostic = context.Diagnostics.First();
             context.RegisterCodeFix(
-                new MyCodeAction(c => UpdateDocumentAsync(document, diagnostic, c)),
+                CodeAction.Create(
+                    CSharpCodeFixesResources.Remove_blank_lines_between_braces,
+                    c => UpdateDocumentAsync(document, diagnostic, c),
+                    nameof(CSharpCodeFixesResources.Remove_blank_lines_between_braces)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -94,13 +97,5 @@ private static void FixOne(
 
         public override FixAllProvider GetFixAllProvider()
             => FixAllProvider.Create(async (context, document, diagnostics) => await FixAllAsync(document, diagnostics, context.CancellationToken).ConfigureAwait(false));
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpCodeFixesResources.Remove_blank_lines_between_braces, createChangedDocument, CSharpCodeFixesResources.Remove_blank_lines_between_braces)
-            {
-            }
-        }
     }
 }
diff --git a/...ewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementCodeFixProvider.cs b/...ewLines/ConstructorInitializerPlacement/ConstructorInitializerPlacementCodeFixProvider.cs
@@ -36,7 +36,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
             var document = context.Document;
             var diagnostic = context.Diagnostics.First();
             context.RegisterCodeFix(
-                new MyCodeAction(c => UpdateDocumentAsync(document, ImmutableArray.Create(diagnostic), c)),
+                CodeAction.Create(
+                    CSharpCodeFixesResources.Place_colon_on_following_line,
+                    c => UpdateDocumentAsync(document, ImmutableArray.Create(diagnostic), c),
+                    nameof(CSharpCodeFixesResources.Place_colon_on_following_line)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -112,13 +115,5 @@ static SyntaxToken ComputeNewCloseParen(SyntaxToken colonToken, SyntaxToken prev
 
         public override FixAllProvider? GetFixAllProvider()
             => FixAllProvider.Create(async (context, document, diagnostics) => await UpdateDocumentAsync(document, diagnostics, context.CancellationToken).ConfigureAwait(false));
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpCodeFixesResources.Place_colon_on_following_line, createChangedDocument, CSharpCodeFixesResources.Place_colon_on_following_line)
-            {
-            }
-        }
     }
 }
diff --git a/...odeFixes/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementCodeFixProvider.cs b/...odeFixes/NewLines/EmbeddedStatementPlacement/EmbeddedStatementPlacementCodeFixProvider.cs
@@ -37,7 +37,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
             var document = context.Document;
             var diagnostic = context.Diagnostics.First();
             context.RegisterCodeFix(
-                new MyCodeAction(c => UpdateDocumentAsync(document, diagnostic, c)),
+                CodeAction.Create(
+                    CSharpCodeFixesResources.Place_statement_on_following_line,
+                    c => UpdateDocumentAsync(document, diagnostic, c),
+                    nameof(CSharpCodeFixesResources.Place_statement_on_following_line)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -140,13 +143,5 @@ private static SyntaxToken AddLeadingTrivia(SyntaxToken token, SyntaxTrivia triv
         public override FixAllProvider GetFixAllProvider()
             => FixAllProvider.Create(
                 async (context, document, diagnostics) => await FixAllAsync(document, diagnostics, context.CancellationToken).ConfigureAwait(false));
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpCodeFixesResources.Place_statement_on_following_line, createChangedDocument, CSharpCodeFixesResources.Place_statement_on_following_line)
-            {
-            }
-        }
     }
 }
diff --git a/...p/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs b/...p/CodeFixes/RemoveConfusingSuppression/CSharpRemoveConfusingSuppressionCodeFixProvider.cs
@@ -42,14 +42,14 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
             var cancellationToken = context.CancellationToken;
 
             context.RegisterCodeFix(
-                new MyCodeAction(
+                CodeAction.Create(
                     CSharpAnalyzersResources.Remove_operator_preserves_semantics,
                     c => FixAllAsync(document, diagnostics, negate: false, c),
                     RemoveOperator),
                 context.Diagnostics);
 
             context.RegisterCodeFix(
-                new MyCodeAction(
+                CodeAction.Create(
                     CSharpAnalyzersResources.Negate_expression_changes_semantics,
                     c => FixAllAsync(document, diagnostics, negate: true, c),
                     NegateExpression),
@@ -104,13 +104,5 @@ await FixAllAsync(
                     document, diagnostics,
                     context.CodeActionEquivalenceKey == NegateExpression,
                     context.CancellationToken).ConfigureAwait(false));
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument, string equivalenceKey)
-                : base(title, createChangedDocument, equivalenceKey)
-            {
-            }
-        }
     }
 }
diff --git a/...zers/CSharp/CodeFixes/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastCodeFixProvider.cs b/...zers/CSharp/CodeFixes/RemoveUnnecessaryCast/CSharpRemoveUnnecessaryCastCodeFixProvider.cs
@@ -38,8 +38,10 @@ public CSharpRemoveUnnecessaryCastCodeFixProvider()
 
         public sealed override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-            context.RegisterCodeFix(new MyCodeAction(
-                c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+            context.RegisterCodeFix(CodeAction.Create(
+                AnalyzersResources.Remove_Unnecessary_Cast,
+                c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                nameof(AnalyzersResources.Remove_Unnecessary_Cast)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -92,13 +94,5 @@ private ExpressionSyntax Recurse(ExpressionSyntax old)
                 throw ExceptionUtilities.UnexpectedValue(old);
             }
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(AnalyzersResources.Remove_Unnecessary_Cast, createChangedDocument, nameof(AnalyzersResources.Remove_Unnecessary_Cast))
-            {
-            }
-        }
     }
 }
diff --git a/...UnnecessaryDiscardDesignation/CSharpRemoveUnnecessaryDiscardDesignationCodeFixProvider.cs b/...UnnecessaryDiscardDesignation/CSharpRemoveUnnecessaryDiscardDesignationCodeFixProvider.cs
@@ -37,7 +37,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             var diagnostic = context.Diagnostics.First();
             context.RegisterCodeFix(
-                new MyCodeAction(c => FixAsync(context.Document, diagnostic, c)),
+                CodeAction.Create(
+                    CSharpAnalyzersResources.Remove_unnessary_discard,
+                    c => FixAsync(context.Document, diagnostic, c),
+                    nameof(CSharpAnalyzersResources.Remove_unnessary_discard)),
                 diagnostic);
 
             return Task.CompletedTask;
@@ -92,14 +95,5 @@ protected override Task FixAllAsync(
 
             return Task.CompletedTask;
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(
-                Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Remove_unnessary_discard, createChangedDocument, CSharpAnalyzersResources.Remove_unnessary_discard)
-            {
-            }
-        }
     }
 }
diff --git a/...moveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionCodeFixProvider.cs b/...moveUnnecessaryLambdaExpression/CSharpRemoveUnnecessaryLambdaExpressionCodeFixProvider.cs
@@ -37,7 +37,10 @@ public override ImmutableArray<string> FixableDiagnosticIds
         public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             context.RegisterCodeFix(
-                new MyCodeAction(c => FixAsync(context.Document, context.Diagnostics.First(), c)),
+                CodeAction.Create(
+                    CSharpAnalyzersResources.Remove_unnecessary_lambda_expression,
+                    c => FixAsync(context.Document, context.Diagnostics.First(), c),
+                    nameof(CSharpAnalyzersResources.Remove_unnecessary_lambda_expression)),
                 context.Diagnostics);
             return Task.CompletedTask;
         }
@@ -65,13 +68,5 @@ protected override Task FixAllAsync(
 
             return Task.CompletedTask;
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Remove_unnecessary_lambda_expression, createChangedDocument, nameof(CSharpRemoveUnnecessaryLambdaExpressionCodeFixProvider))
-            {
-            }
-        }
     }
 }
diff --git a/.../CSharp/CodeFixes/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternCodeFixProvider.cs b/.../CSharp/CodeFixes/SimplifyPropertyPattern/CSharpSimplifyPropertyPatternCodeFixProvider.cs
@@ -36,8 +36,10 @@ public CSharpSimplifyPropertyPatternCodeFixProvider()
 
         public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
-            context.RegisterCodeFix(new MyCodeAction(
-                c => FixAsync(context.Document, context.Diagnostics[0], c)),
+            context.RegisterCodeFix(CodeAction.Create(
+                CSharpAnalyzersResources.Simplify_property_pattern,
+                c => FixAsync(context.Document, context.Diagnostics[0], c),
+                nameof(CSharpAnalyzersResources.Simplify_property_pattern)),
                 context.Diagnostics);
 
             return Task.CompletedTask;
@@ -120,13 +122,5 @@ protected override Task FixAllAsync(
             // the result.
             return Merge(Merge(outerExpression, innerMemberAccess.Expression), innerMemberAccess.Name);
         }
-
-        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
-        {
-            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpAnalyzersResources.Simplify_property_pattern, createChangedDocument, nameof(CSharpAnalyzersResources.Simplify_property_pattern))
-            {
-            }
-        }
     }
 }