Simplify

Author: CyrusNajmabadi

src/Analyzers/CSharp/CodeFixes/UseNullPropagation/CSharpUseNullPropagationCodeFixProvider.cs

@@ -17,6 +17,7 @@ namespace Microsoft.CodeAnalysis.CSharp.UseNullPropagation;
 [method: ImportingConstructor]
 [method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
 internal sealed class CSharpUseNullPropagationCodeFixProvider() : AbstractUseNullPropagationCodeFixProvider<
+    CSharpUseNullPropagationDiagnosticAnalyzer,
     SyntaxKind,
     ExpressionSyntax,
     StatementSyntax,
@@ -31,7 +32,7 @@ internal sealed class CSharpUseNullPropagationCodeFixProvider() : AbstractUseNul
     ExpressionStatementSyntax,
     BracketedArgumentListSyntax>
 {
-    protected override AbstractUseNullPropagationDiagnosticAnalyzer<SyntaxKind, ExpressionSyntax, StatementSyntax, ConditionalExpressionSyntax, BinaryExpressionSyntax, InvocationExpressionSyntax, ConditionalAccessExpressionSyntax, ElementAccessExpressionSyntax, MemberAccessExpressionSyntax, IfStatementSyntax, ExpressionStatementSyntax> Analyzer
+    protected override CSharpUseNullPropagationDiagnosticAnalyzer Analyzer
         => CSharpUseNullPropagationDiagnosticAnalyzer.Instance;
 
     private static BlockSyntax ReplaceBlockStatements(BlockSyntax block, StatementSyntax newInnerStatement)

src/Analyzers/Core/CodeFixes/UseNullPropagation/AbstractUseNullPropagationCodeFixProvider.cs

@@ -21,6 +21,7 @@
 namespace Microsoft.CodeAnalysis.UseNullPropagation;
 
 internal abstract class AbstractUseNullPropagationCodeFixProvider<
+    TAnalyzer,
     TSyntaxKind,
     TExpressionSyntax,
     TStatementSyntax,
@@ -34,6 +35,11 @@ internal abstract class AbstractUseNullPropagationCodeFixProvider<
     TIfStatementSyntax,
     TExpressionStatementSyntax,
     TElementBindingArgumentListSyntax> : ForkingSyntaxEditorBasedCodeFixProvider<SyntaxNode>
+    where TAnalyzer : AbstractUseNullPropagationDiagnosticAnalyzer<
+        TSyntaxKind, TExpressionSyntax, TStatementSyntax,
+        TConditionalExpressionSyntax, TBinaryExpressionSyntax, TInvocationExpressionSyntax,
+        TConditionalAccessExpressionSyntax, TElementAccessExpressionSyntax, TMemberAccessExpressionSyntax,
+        TIfStatementSyntax, TExpressionStatementSyntax>
     where TSyntaxKind : struct
     where TExpressionSyntax : SyntaxNode
     where TStatementSyntax : SyntaxNode
@@ -51,11 +57,7 @@ internal abstract class AbstractUseNullPropagationCodeFixProvider<
     protected abstract SyntaxNode PostProcessElseIf(TIfStatementSyntax ifStatement, TStatementSyntax newWhenTrueStatement);
     protected abstract TElementBindingExpressionSyntax ElementBindingExpression(TElementBindingArgumentListSyntax argumentList);
 
-    protected abstract AbstractUseNullPropagationDiagnosticAnalyzer<
-        TSyntaxKind, TExpressionSyntax, TStatementSyntax,
-        TConditionalExpressionSyntax, TBinaryExpressionSyntax, TInvocationExpressionSyntax,
-        TConditionalAccessExpressionSyntax, TElementAccessExpressionSyntax, TMemberAccessExpressionSyntax,
-        TIfStatementSyntax, TExpressionStatementSyntax> Analyzer { get; }
+    protected abstract TAnalyzer Analyzer { get; }
 
     public override ImmutableArray<string> FixableDiagnosticIds
         => [IDEDiagnosticIds.UseNullPropagationDiagnosticId];

src/Analyzers/VisualBasic/CodeFixes/UseNullPropagation/VisualBasicUseNullPropagationCodeFixProvider.vb

@@ -12,6 +12,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UseNullPropagation
     <ExportCodeFixProvider(LanguageNames.VisualBasic, Name:=PredefinedCodeFixProviderNames.UseNullPropagation), [Shared]>
     Friend NotInheritable Class VisualBasicUseNullPropagationCodeFixProvider
         Inherits AbstractUseNullPropagationCodeFixProvider(Of
+            VisualBasicUseNullPropagationDiagnosticAnalyzer,
             SyntaxKind,
             ExpressionSyntax,
             ExecutableStatementSyntax,
@@ -31,8 +32,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UseNullPropagation
         Public Sub New()
         End Sub
 
-        Protected Overrides ReadOnly Property Analyzer As AbstractUseNullPropagationDiagnosticAnalyzer(Of SyntaxKind, ExpressionSyntax, ExecutableStatementSyntax, TernaryConditionalExpressionSyntax, BinaryExpressionSyntax, InvocationExpressionSyntax, ConditionalAccessExpressionSyntax, InvocationExpressionSyntax, MemberAccessExpressionSyntax, MultiLineIfBlockSyntax, ExpressionStatementSyntax) =
-            VisualBasicUseNullPropagationDiagnosticAnalyzer.Instance
+        Protected Overrides ReadOnly Property Analyzer As VisualBasicUseNullPropagationDiagnosticAnalyzer = VisualBasicUseNullPropagationDiagnosticAnalyzer.Instance
 
         Protected Overrides Function PostProcessElseIf(ifStatement As MultiLineIfBlockSyntax, newWhenTrueStatement As ExecutableStatementSyntax) As SyntaxNode
             Throw ExceptionUtilities.Unreachable()