Merge pull request #60524 from Youssef1313/move-some-fixes

Move few `CodeFixProvider`s to Analyzers layer
dotnet · Apr 5, 2022 · 60a165c · 60a165c
2 parents b999a65 + 97ba8a2
commit 60a165c
Show file tree

Hide file tree

Showing 160 changed files with 1,706 additions and 1,555 deletions.
diff --git a/...citCast/AddExplicitCastCodeFixProvider.cs → ...citCast/AddExplicitCastCodeFixProvider.cs b/...citCast/AddExplicitCastCodeFixProvider.cs → ...citCast/AddExplicitCastCodeFixProvider.cs
diff --git a/...odeFixes/AddExplicitCast/ArgumentFixer.cs → ...odeFixes/AddExplicitCast/ArgumentFixer.cs b/...odeFixes/AddExplicitCast/ArgumentFixer.cs → ...odeFixes/AddExplicitCast/ArgumentFixer.cs
diff --git a/...AddExplicitCast/AttributeArgumentFixer.cs → ...AddExplicitCast/AttributeArgumentFixer.cs b/...AddExplicitCast/AttributeArgumentFixer.cs → ...AddExplicitCast/AttributeArgumentFixer.cs
diff --git a/...nheritdoc/AddInheritdocCodeFixProvider.cs → ...nheritdoc/AddInheritdocCodeFixProvider.cs b/...nheritdoc/AddInheritdocCodeFixProvider.cs → ...nheritdoc/AddInheritdocCodeFixProvider.cs
@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -78,7 +79,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
                     if (symbol.IsOverride ||
                         symbol.ImplicitInterfaceImplementations().Any())
                     {
-                        context.RegisterCodeFix(new MyCodeAction(FeaturesResources.Explicitly_inherit_documentation,
+                        context.RegisterCodeFix(new MyCodeAction(CSharpCodeFixesResources.Explicitly_inherit_documentation,
                             c => FixAsync(context.Document, diagnostic, c)), context.Diagnostics);
                     }
                 }
@@ -97,7 +98,12 @@ protected override async Task FixAllAsync(Document document, ImmutableArray<Diag
                     continue;
                 }
 
-                newLine ??= (await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false)).GetOption(FormattingOptions2.NewLine);
+#if CODE_STYLE
+                var options = document.Project.AnalyzerOptions.GetAnalyzerOptionSet(node.SyntaxTree, cancellationToken);
+#else
+                var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+#endif
+                newLine ??= options.GetOption(FormattingOptions2.NewLine);
                 // We can safely assume, that there is no leading doc comment, because that is what CS1591 is telling us.
                 // So we create a new /// <inheritdoc/> comment.
                 var xmlSpaceAfterTripleSlash = Token(leading: TriviaList(DocumentationCommentExterior("///")), SyntaxKind.XmlTextLiteralToken, text: " ", valueText: " ", trailing: default);
@@ -126,10 +132,10 @@ protected override async Task FixAllAsync(Document document, ImmutableArray<Diag
             }
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(title, createChangedDocument, equivalenceKey: nameof(FeaturesResources.Explicitly_inherit_documentation))
+                : base(title, createChangedDocument, equivalenceKey: nameof(CSharpCodeFixesResources.Explicitly_inherit_documentation))
             {
             }
         }

diff --git a/...arpAddObsoleteAttributeCodeFixProvider.cs → ...arpAddObsoleteAttributeCodeFixProvider.cs b/...arpAddObsoleteAttributeCodeFixProvider.cs → ...arpAddObsoleteAttributeCodeFixProvider.cs
@@ -30,7 +30,7 @@ internal class CSharpAddObsoleteAttributeCodeFixProvider
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public CSharpAddObsoleteAttributeCodeFixProvider()
-            : base(CSharpSyntaxFacts.Instance, CSharpFeaturesResources.Add_Obsolete)
+            : base(CSharpSyntaxFacts.Instance, CSharpCodeFixesResources.Add_Obsolete)
         {
         }
     }

diff --git a/...SharpAliasAmbiguousTypeCodeFixProvider.cs → ...SharpAliasAmbiguousTypeCodeFixProvider.cs b/...SharpAliasAmbiguousTypeCodeFixProvider.cs → ...SharpAliasAmbiguousTypeCodeFixProvider.cs
diff --git a/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems b/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems
@@ -16,11 +16,29 @@
     <Compile Include="$(MSBuildThisFileDirectory)AddAccessibilityModifiers\CSharpAddAccessibilityModifiersCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AddAccessibilityModifiers\CSharpAddAccessibilityModifiersService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)AddBraces\CSharpAddBracesCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AddExplicitCast\AddExplicitCastCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AddExplicitCast\ArgumentFixer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AddExplicitCast\AttributeArgumentFixer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AddInheritdoc\AddInheritdocCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AddObsoleteAttribute\CSharpAddObsoleteAttributeCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AliasAmbiguousType\CSharpAliasAmbiguousTypeCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ConvertNamespace\ConvertNamespaceCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ConvertNamespace\ConvertNamespaceTransform.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ConvertTypeOfToNameOf\CSharpConvertTypeOfToNameOfCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ConvertSwitchStatementToExpression\ConvertSwitchStatementToExpressionCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ConvertSwitchStatementToExpression\ConvertSwitchStatementToExpressionCodeFixProvider.Rewriter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DisambiguateSameVariable\CSharpDisambiguateSameVariableCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FixReturnType\CSharpFixReturnTypeCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HideBase\HideBaseCodeFixProvider.AddNewKeywordAction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HideBase\HideBaseCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Iterator\CSharpAddYieldCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Iterator\CSharpChangeToIEnumerableCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MakeMemberStatic\CSharpMakeMemberStaticCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MakeStatementAsynchronous\CSharpMakeStatementAsynchronousCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MakeTypeAbstract\CSharpMakeTypeAbstractCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Nullable\CSharpDeclareAsNullableCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UnsealClass\CSharpUnsealClassCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UseInterpolatedVerbatimString\CSharpUseInterpolatedVerbatimStringCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UsePatternCombinators\CSharpUsePatternCombinatorsCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)FileHeaders\CSharpFileHeaderCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)InlineDeclaration\CSharpInlineDeclarationCodeFixProvider.cs" />
@@ -83,4 +101,4 @@
   <ItemGroup Condition="'$(DefaultLanguageSourceExtension)' != '' AND '$(BuildingInsideVisualStudio)' != 'true'">
     <ExpectedCompile Include="$(MSBuildThisFileDirectory)**\*$(DefaultLanguageSourceExtension)" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixesResources.resx b/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixesResources.resx
@@ -147,4 +147,41 @@
   <data name="Fix_record_declaration" xml:space="preserve">
     <value>Fix_record_declaration</value>
   </data>
+  <data name="Change_return_type_from_0_to_1" xml:space="preserve">
+    <value>Change return type from {0} to {1}</value>
+  </data>
+  <data name="Hide_base_member" xml:space="preserve">
+    <value>Hide base member</value>
+  </data>
+  <data name="Add_Obsolete" xml:space="preserve">
+    <value>Add [Obsolete]</value>
+  </data>
+  <data name="Explicitly_inherit_documentation" xml:space="preserve">
+    <value>Explicitly inherit documentation</value>
+  </data>
+  <data name="Unseal_class_0" xml:space="preserve">
+    <value>Unseal class '{0}'</value>
+  </data>
+  <data name="Use_interpolated_verbatim_string" xml:space="preserve">
+    <value>Use interpolated verbatim string</value>
+  </data>
+  <data name="Add_await" xml:space="preserve">
+    <value>Add 'await'</value>
+    <comment>{Locked="await"} "await" is a C# keyword and should not be localized.</comment>
+  </data>
+  <data name="Assign_to_0" xml:space="preserve">
+    <value>Assign to '{0}'</value>
+  </data>
+  <data name="Compare_to_0" xml:space="preserve">
+    <value>Compare to '{0}'</value>
+  </data>
+  <data name="Fix_return_type" xml:space="preserve">
+    <value>Fix return type</value>
+  </data>
+  <data name="Replace_return_with_yield_return" xml:space="preserve">
+    <value>Replace return with yield return</value>
+  </data>
+  <data name="Declare_as_nullable" xml:space="preserve">
+    <value>Declare as nullable</value>
+  </data>
 </root>
diff --git a/...isambiguateSameVariableCodeFixProvider.cs → ...isambiguateSameVariableCodeFixProvider.cs b/...isambiguateSameVariableCodeFixProvider.cs → ...isambiguateSameVariableCodeFixProvider.cs
@@ -71,8 +71,8 @@ private static bool CanFix(
             var node = diagnostic.Location.FindNode(getInnermostNodeForTie: true, cancellationToken);
             var (left, right, titleFormat) = node switch
             {
-                BinaryExpressionSyntax binary => (binary.Left, binary.Right, CSharpFeaturesResources.Compare_to_0),
-                AssignmentExpressionSyntax assignment => (assignment.Left, assignment.Right, CSharpFeaturesResources.Assign_to_0),
+                BinaryExpressionSyntax binary => (binary.Left, binary.Right, CSharpCodeFixesResources.Compare_to_0),
+                AssignmentExpressionSyntax assignment => (assignment.Left, assignment.Right, CSharpCodeFixesResources.Assign_to_0),
                 _ => default,
             };
 
@@ -168,7 +168,7 @@ protected override async Task FixAllAsync(
             }
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument)
                 : base(title, createChangedDocument, nameof(CSharpDisambiguateSameVariableCodeFixProvider))

diff --git a/...ype/CSharpFixReturnTypeCodeFixProvider.cs → ...ype/CSharpFixReturnTypeCodeFixProvider.cs b/...ype/CSharpFixReturnTypeCodeFixProvider.cs → ...ype/CSharpFixReturnTypeCodeFixProvider.cs
@@ -130,10 +130,10 @@ private static (TypeSyntax type, bool useTask) TryGetDeclarationTypeToFix(Syntax
             }
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpFeaturesResources.Fix_return_type, createChangedDocument, nameof(CSharpFeaturesResources.Fix_return_type))
+                : base(CSharpCodeFixesResources.Fix_return_type, createChangedDocument, nameof(CSharpCodeFixesResources.Fix_return_type))
             {
             }
         }

diff --git a/...aseCodeFixProvider.AddNewKeywordAction.cs → ...aseCodeFixProvider.AddNewKeywordAction.cs b/...aseCodeFixProvider.AddNewKeywordAction.cs → ...aseCodeFixProvider.AddNewKeywordAction.cs
@@ -12,6 +12,13 @@
 using Microsoft.CodeAnalysis.OrderModifiers;
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.CSharp.LanguageServices;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+#if CODE_STYLE
+using OptionSet = Microsoft.CodeAnalysis.Diagnostics.AnalyzerConfigOptions;
+#else
+using Microsoft.CodeAnalysis.Options;
+#endif
 
 namespace Microsoft.CodeAnalysis.CSharp.CodeFixes.HideBase
 {
@@ -22,7 +29,7 @@ private class AddNewKeywordAction : CodeActions.CodeAction
             private readonly Document _document;
             private readonly SyntaxNode _node;
 
-            public override string Title => CSharpFeaturesResources.Hide_base_member;
+            public override string Title => CSharpCodeFixesResources.Hide_base_member;
 
             public AddNewKeywordAction(Document document, SyntaxNode node)
             {
@@ -34,19 +41,24 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
             {
                 var root = await _document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
 
-                var newNode = await GetNewNodeAsync(_node, cancellationToken).ConfigureAwait(false);
+#if CODE_STYLE
+                var options = _document.Project.AnalyzerOptions.GetAnalyzerOptionSet(_node.SyntaxTree, cancellationToken);
+#else
+                var options = await _document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+#endif
+
+                var newNode = GetNewNode(_node, options);
                 var newRoot = root.ReplaceNode(_node, newNode);
 
                 return _document.WithSyntaxRoot(newRoot);
             }
 
-            private async Task<SyntaxNode> GetNewNodeAsync(SyntaxNode node, CancellationToken cancellationToken)
+            private static SyntaxNode GetNewNode(SyntaxNode node, OptionSet options)
             {
                 var syntaxFacts = CSharpSyntaxFacts.Instance;
                 var modifiers = syntaxFacts.GetModifiers(node);
                 var newModifiers = modifiers.Add(SyntaxFactory.Token(SyntaxKind.NewKeyword));
 
-                var options = await _document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
                 var option = options.GetOption(CSharpCodeStyleOptions.PreferredModifierOrder);
                 if (!CSharpOrderModifiersHelper.Instance.TryGetOrComputePreferredOrder(option.Value, out var preferredOrder) ||
                     !AbstractOrderModifiersHelpers.IsOrdered(preferredOrder, modifiers))

diff --git a/...Fixes/HideBase/HideBaseCodeFixProvider.cs → ...Fixes/HideBase/HideBaseCodeFixProvider.cs b/...Fixes/HideBase/HideBaseCodeFixProvider.cs → ...Fixes/HideBase/HideBaseCodeFixProvider.cs
diff --git a/...Iterator/CSharpAddYieldCodeFixProvider.cs → ...Iterator/CSharpAddYieldCodeFixProvider.cs b/...Iterator/CSharpAddYieldCodeFixProvider.cs → ...Iterator/CSharpAddYieldCodeFixProvider.cs
@@ -220,10 +220,10 @@ protected override bool TryGetNode(
             return node != null;
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Document newDocument)
-                : base(CSharpFeaturesResources.Replace_return_with_yield_return, c => Task.FromResult(newDocument), nameof(CSharpFeaturesResources.Replace_return_with_yield_return))
+                : base(CSharpCodeFixesResources.Replace_return_with_yield_return, c => Task.FromResult(newDocument), nameof(CSharpCodeFixesResources.Replace_return_with_yield_return))
             {
             }
         }

diff --git a/...harpChangeToIEnumerableCodeFixProvider.cs → ...harpChangeToIEnumerableCodeFixProvider.cs b/...harpChangeToIEnumerableCodeFixProvider.cs → ...harpChangeToIEnumerableCodeFixProvider.cs
@@ -111,7 +111,7 @@ protected override async Task<CodeAction> GetCodeFixAsync(SyntaxNode root, Synta
             }
 
             return new MyCodeAction(
-                string.Format(CSharpFeaturesResources.Change_return_type_from_0_to_1,
+                string.Format(CSharpCodeFixesResources.Change_return_type_from_0_to_1,
                     type.ToMinimalDisplayString(model, node.SpanStart),
                     ienumerableGenericSymbol.ToMinimalDisplayString(model, node.SpanStart)), newDocument);
         }
@@ -130,7 +130,7 @@ private static bool TryGetIEnumerableSymbols(SemanticModel model, out INamedType
             return true;
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(string title, Document newDocument)
                 : base(title, c => Task.FromResult(newDocument), title)

diff --git a/.../CSharpMakeMemberStaticCodeFixProvider.cs → .../CSharpMakeMemberStaticCodeFixProvider.cs b/.../CSharpMakeMemberStaticCodeFixProvider.cs → .../CSharpMakeMemberStaticCodeFixProvider.cs
diff --git a/...keStatementAsynchronousCodeFixProvider.cs → ...keStatementAsynchronousCodeFixProvider.cs b/...keStatementAsynchronousCodeFixProvider.cs → ...keStatementAsynchronousCodeFixProvider.cs
@@ -115,12 +115,12 @@ private static SyntaxNode TryGetStatementToFix(SyntaxNode node)
             return null;
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(CSharpFeaturesResources.Add_await,
+                : base(CSharpCodeFixesResources.Add_await,
                        createChangedDocument,
-                       CSharpFeaturesResources.Add_await)
+                       CSharpCodeFixesResources.Add_await)
             {
             }
         }

diff --git a/.../CSharpMakeTypeAbstractCodeFixProvider.cs → .../CSharpMakeTypeAbstractCodeFixProvider.cs b/.../CSharpMakeTypeAbstractCodeFixProvider.cs → .../CSharpMakeTypeAbstractCodeFixProvider.cs
diff --git a/...CSharpDeclareAsNullableCodeFixProvider.cs → ...CSharpDeclareAsNullableCodeFixProvider.cs b/...CSharpDeclareAsNullableCodeFixProvider.cs → ...CSharpDeclareAsNullableCodeFixProvider.cs
@@ -381,10 +381,10 @@ private static bool IsExpressionSupported(SyntaxNode node)
                 SyntaxKind.VariableDeclarator);
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument, string equivalenceKey)
-                : base(CSharpFeaturesResources.Declare_as_nullable,
+                : base(CSharpCodeFixesResources.Declare_as_nullable,
                        createChangedDocument,
                        equivalenceKey)
             {

diff --git a/...Class/CSharpUnsealClassCodeFixProvider.cs → ...Class/CSharpUnsealClassCodeFixProvider.cs b/...Class/CSharpUnsealClassCodeFixProvider.cs → ...Class/CSharpUnsealClassCodeFixProvider.cs
@@ -26,6 +26,6 @@ public CSharpUnsealClassCodeFixProvider()
         public override ImmutableArray<string> FixableDiagnosticIds { get; } =
             ImmutableArray.Create(CS0509);
 
-        protected override string TitleFormat => CSharpFeaturesResources.Unseal_class_0;
+        protected override string TitleFormat => CSharpCodeFixesResources.Unseal_class_0;
     }
 }
diff --git a/...erpolatedVerbatimStringCodeFixProvider.cs → ...erpolatedVerbatimStringCodeFixProvider.cs b/...erpolatedVerbatimStringCodeFixProvider.cs → ...erpolatedVerbatimStringCodeFixProvider.cs
@@ -75,10 +75,10 @@ private static void AddEdits(
             editor.ReplaceNode(verbatimInterpolated, interpolatedVerbatim);
         }
 
-        private class MyCodeAction : CodeAction.DocumentChangeAction
+        private class MyCodeAction : CustomCodeActions.DocumentChangeAction
         {
             public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(FeaturesResources.Use_interpolated_verbatim_string, createChangedDocument, nameof(FeaturesResources.Use_interpolated_verbatim_string))
+                : base(CSharpCodeFixesResources.Use_interpolated_verbatim_string, createChangedDocument, nameof(CSharpCodeFixesResources.Use_interpolated_verbatim_string))
             {
             }
         }