Only report a hidden diagnostic for cases where SA1501 overlaps with SA1519

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/LayoutRules/SA1501CodeFixProvider.cs

@@ -39,6 +39,11 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
         {
             foreach (Diagnostic diagnostic in context.Diagnostics)
             {
+                if (diagnostic.Properties.GetValueOrDefault(SA1501StatementMustNotBeOnASingleLine.SuppressCodeFixKey) == SA1501StatementMustNotBeOnASingleLine.SuppressCodeFixValue)
+                {
+                    continue;
+                }
+
                 context.RegisterCodeFix(
                     CodeAction.Create(
                         LayoutResources.SA1501CodeFix,

StyleCop.Analyzers/StyleCop.Analyzers.Test/LayoutRules/SA1501UnitTests.cs

@@ -4,7 +4,6 @@
 namespace StyleCop.Analyzers.Test.LayoutRules
 {
     using System.Collections.Generic;
-    using System.Collections.Immutable;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis;
@@ -646,7 +645,66 @@ public void Bar(int i)
     }
 }";
 
-            var fixedCode = @"using System.Diagnostics;
+            var incrementalFixedCode = @"using System.Diagnostics;
+public class TypeName
+{
+    public void Bar(int i)
+    {
+        if (i == 0)
+            Debug.Assert(true);
+        else
+            Debug.Assert(false);//8
+
+
+        if (i == 1)
+            Debug.Assert(true);
+        else if (i == 2)
+            Debug.Assert(false);//10
+
+
+        if (i == 3)
+            Debug.Assert(true);
+        else if (i == 4)
+            Debug.Assert(false);//14
+
+
+        if (i == 5)
+            Debug.Assert(true);
+        else if (i == 6)
+            Debug.Assert(false);
+        else
+            Debug.Assert(false);//16
+
+
+        if (i == 7)
+            if (i == 8)
+                Debug.Assert(false);
+            else
+                Debug.Assert(false);
+        else
+            Debug.Assert(true);//18
+
+
+        if (i == 9)
+            if (i == 10)
+                Debug.Assert(false);
+            else
+                Debug.Assert(false);
+            else
+            Debug.Assert(true);//21
+
+
+        if (i == 11) if (i == 12)
+            Debug.Assert(false);
+            else
+            Debug.Assert(false);
+        else if (i == 13)
+            Debug.Assert(true);//24
+
+    }
+}";
+
+            var batchFixedCode = @"using System.Diagnostics;
 public class TypeName
 {
     public void Bar(int i)
@@ -710,27 +768,30 @@ public void Bar(int i)
             {
                 this.CSharpDiagnostic().WithLocation(8, 14),
                 this.CSharpDiagnostic().WithLocation(10, 21),
-                this.CSharpDiagnostic().WithLocation(10, 58).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(10, 58),
                 this.CSharpDiagnostic().WithLocation(14, 26),
                 this.CSharpDiagnostic().WithLocation(16, 21),
-                this.CSharpDiagnostic().WithLocation(16, 58).WithSeverity(DiagnosticSeverity.Hidden),
-                this.CSharpDiagnostic().WithLocation(16, 84).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(16, 58),
+                this.CSharpDiagnostic().WithLocation(16, 84),
                 this.CSharpDiagnostic().WithLocation(18, 21),
-                this.CSharpDiagnostic().WithLocation(18, 33).WithSeverity(DiagnosticSeverity.Hidden),
-                this.CSharpDiagnostic().WithLocation(18, 59).WithSeverity(DiagnosticSeverity.Hidden),
-                this.CSharpDiagnostic().WithLocation(18, 85).WithSeverity(DiagnosticSeverity.Hidden),
-                this.CSharpDiagnostic().WithLocation(21, 26).WithSeverity(DiagnosticSeverity.Hidden),
-                this.CSharpDiagnostic().WithLocation(21, 52).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(18, 33),
+                this.CSharpDiagnostic().WithLocation(18, 59),
+                this.CSharpDiagnostic().WithLocation(18, 85),
+                this.CSharpDiagnostic().WithLocation(21, 26),
+                this.CSharpDiagnostic().WithLocation(21, 52),
                 this.CSharpDiagnostic().WithLocation(21, 78),
                 this.CSharpDiagnostic().WithLocation(23, 22).WithSeverity(DiagnosticSeverity.Hidden),
                 this.CSharpDiagnostic().WithLocation(23, 35),
-                this.CSharpDiagnostic().WithLocation(24, 18).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(24, 18),
                 this.CSharpDiagnostic().WithLocation(24, 57),
             };
 
+            DiagnosticResult incrementalFixExpected = this.CSharpDiagnostic().WithLocation(50, 22).WithSeverity(DiagnosticSeverity.Hidden);
+
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
-            await this.VerifyCSharpFixAsync(testCode, fixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(incrementalFixedCode, incrementalFixExpected, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpDiagnosticAsync(batchFixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+            await this.VerifyCSharpFixAsync(testCode, incrementalFixedCode, batchFixedCode, cancellationToken: CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -781,7 +842,7 @@ public void Bar(int i)
             DiagnosticResult[] expected =
             {
                 this.CSharpDiagnostic().WithLocation(6, 21),
-                this.CSharpDiagnostic().WithLocation(6, 46).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(6, 46),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
@@ -880,7 +941,7 @@ public void Bar(int i)
             DiagnosticResult[] expected =
             {
                 this.CSharpDiagnostic().WithLocation(6, 21),
-                this.CSharpDiagnostic().WithLocation(6, 33).WithSeverity(DiagnosticSeverity.Hidden),
+                this.CSharpDiagnostic().WithLocation(6, 33),
             };
 
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);