CA1853: Address issues found in PR review #6767 (#6791)

* Rename do not guard set analyzer and fixer

This is done in a separate commit, so that the actual changes can be
seen in the next commit. This is because git would not recognize the
rename if the changes were added as is.

Note that this commit by itself is broken.

* Combine analyzers for guarded calls

This combines the analyzers CA1853 and CA1868 to avoid code duplication,
make CA1853 support the same range of cases as CA1868 and fix #6781.

Author: mpidash

src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/Performance/CSharpDoNotGuardSetAddOrRemoveByContains.Fixer.cs renamed to src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/Performance/CSharpDoNotGuardCall.Fixer.cs

@@ -11,8 +11,12 @@
 
 namespace Microsoft.NetCore.CSharp.Analyzers.Performance
 {
+    /// <summary>
+    /// CA1853: <inheritdoc cref="NetCore.Analyzers.MicrosoftNetCoreAnalyzersResources.DoNotGuardDictionaryRemoveByContainsKeyTitle"/>
+    /// CA1868: <inheritdoc cref="NetCore.Analyzers.MicrosoftNetCoreAnalyzersResources.DoNotGuardSetAddOrRemoveByContainsTitle"/>
+    /// </summary>
     [ExportCodeFixProvider(LanguageNames.CSharp), Shared]
-    public sealed class CSharpDoNotGuardSetAddOrRemoveByContainsFixer : DoNotGuardSetAddOrRemoveByContainsFixer
+    public sealed class CSharpDoNotGuardCallFixer : DoNotGuardCallFixer
     {
         protected override bool SyntaxSupportedByFixer(SyntaxNode conditionalSyntax, SyntaxNode childStatementSyntax)
         {
@@ -23,9 +27,9 @@ protected override bool SyntaxSupportedByFixer(SyntaxNode conditionalSyntax, Syn
 
             if (conditionalSyntax is IfStatementSyntax ifStatementSyntax)
             {
-                var addOrRemoveInElse = childStatementSyntax.Parent is ElseClauseSyntax || childStatementSyntax.Parent?.Parent is ElseClauseSyntax;
+                var guardedCallInElse = childStatementSyntax.Parent is ElseClauseSyntax || childStatementSyntax.Parent?.Parent is ElseClauseSyntax;
 
-                return addOrRemoveInElse
+                return guardedCallInElse
                     ? ifStatementSyntax.Else?.Statement.ChildNodes().Count() == 1
                     : ifStatementSyntax.Statement.ChildNodes().Count() == 1;
             }
@@ -40,11 +44,11 @@ protected override Document ReplaceConditionWithChild(Document document, SyntaxN
             if (conditionalOperationNode is IfStatementSyntax { Else: not null } ifStatementSyntax)
             {
                 var expression = GetNegatedExpression(document, childOperationNode);
-                var addOrRemoveInElse = childOperationNode.Parent is ElseClauseSyntax || childOperationNode.Parent?.Parent is ElseClauseSyntax;
+                var guardedCallInElse = childOperationNode.Parent is ElseClauseSyntax || childOperationNode.Parent?.Parent is ElseClauseSyntax;
 
                 SyntaxNode newConditionalOperationNode = ifStatementSyntax
                     .WithCondition((ExpressionSyntax)expression)
-                    .WithStatement(addOrRemoveInElse ? ifStatementSyntax.Statement : ifStatementSyntax.Else.Statement)
+                    .WithStatement(guardedCallInElse ? ifStatementSyntax.Statement : ifStatementSyntax.Else.Statement)
                     .WithElse(null)
                     .WithAdditionalAnnotations(Formatter.Annotation).WithTriviaFrom(conditionalOperationNode);
 

src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/Performance/CSharpDoNotGuardDictionaryRemoveByContainsKeyFixer.cs

@@ -9,10 +9,15 @@
 
 namespace Microsoft.NetCore.Analyzers.Performance
 {
-    public abstract class DoNotGuardSetAddOrRemoveByContainsFixer : CodeFixProvider
+    /// <summary>
+    /// CA1853: <inheritdoc cref="MicrosoftNetCoreAnalyzersResources.DoNotGuardDictionaryRemoveByContainsKeyTitle"/>
+    /// CA1868: <inheritdoc cref="MicrosoftNetCoreAnalyzersResources.DoNotGuardSetAddOrRemoveByContainsTitle"/>
+    /// </summary>
+    public abstract class DoNotGuardCallFixer : CodeFixProvider
     {
-        public override ImmutableArray<string> FixableDiagnosticIds { get; } =
-            ImmutableArray.Create(DoNotGuardSetAddOrRemoveByContains.RuleId);
+        public sealed override ImmutableArray<string> FixableDiagnosticIds { get; } = ImmutableArray.Create(
+            DoNotGuardCallAnalyzer.DoNotGuardDictionaryRemoveByContainsKeyRuleId,
+            DoNotGuardCallAnalyzer.DoNotGuardSetAddOrRemoveByContainsRuleId);
 
         public sealed override FixAllProvider GetFixAllProvider()
         {
@@ -44,9 +49,10 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
                 return;
             }
 
-            var codeAction = CodeAction.Create(MicrosoftNetCoreAnalyzersResources.RemoveRedundantGuardCallCodeFixTitle,
+            var codeAction = CodeAction.Create(
+                MicrosoftNetCoreAnalyzersResources.RemoveRedundantGuardCallCodeFixTitle,
                 ct => Task.FromResult(ReplaceConditionWithChild(context.Document, root, conditionalSyntax, childStatementSyntax)),
-                nameof(MicrosoftNetCoreAnalyzersResources.DoNotGuardSetAddOrRemoveByContainsTitle));
+                diagnostic.Descriptor.Id);
 
             context.RegisterCodeFix(codeAction, diagnostic);
         }