Merge pull request #1749 from sharwell/fix-1748

Remove SA1003 handling for tokens covered by other diagnostics

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/TriviaHelper.cs

@@ -485,6 +485,32 @@ public SyntaxTrivia Last()
             {
                 return this[this.Count - 1];
             }
+
+            public bool Any(SyntaxKind kind)
+            {
+                return this.part1.Any(kind) || this.part2.Any(kind);
+            }
+
+            public bool All(Func<SyntaxTrivia, bool> predicate)
+            {
+                foreach (var trivia in this.part1)
+                {
+                    if (!predicate(trivia))
+                    {
+                        return false;
+                    }
+                }
+
+                foreach (var trivia in this.part2)
+                {
+                    if (!predicate(trivia))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
         }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1003SymbolsMustBeSpacedCorrectly.cs

@@ -5,7 +5,6 @@ namespace StyleCop.Analyzers.SpacingRules
 {
     using System;
     using System.Collections.Immutable;
-    using System.Linq;
     using Microsoft.CodeAnalysis;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -268,23 +267,21 @@ private static void HandlePrefixUnaryExpression(SyntaxNodeAnalysisContext contex
             switch (unaryExpression.OperatorToken.Kind())
             {
             case SyntaxKind.PlusToken:
-                analyze = context.IsAnalyzerSuppressed(SA1022PositiveSignsMustBeSpacedCorrectly.DiagnosticId);
-                break;
             case SyntaxKind.MinusToken:
-                analyze = context.IsAnalyzerSuppressed(SA1021NegativeSignsMustBeSpacedCorrectly.DiagnosticId);
-                break;
             case SyntaxKind.PlusPlusToken:
             case SyntaxKind.MinusMinusToken:
-                analyze = context.IsAnalyzerSuppressed(SA1020IncrementDecrementSymbolsMustBeSpacedCorrectly.DiagnosticId);
+                // These expressions are handled by SA1020, SA1021, SA1022
+                analyze = false;
                 break;
+
             default:
                 analyze = true;
                 break;
             }
 
             if (analyze)
             {
-                if (followingTrivia.Any(t => t.IsKind(SyntaxKind.SingleLineCommentTrivia)) || followingTrivia.Any(t => t.IsKind(SyntaxKind.MultiLineCommentTrivia)))
+                if (followingTrivia.Any(SyntaxKind.SingleLineCommentTrivia) || followingTrivia.Any(SyntaxKind.MultiLineCommentTrivia))
                 {
                     context.ReportDiagnostic(Diagnostic.Create(DescriptorNotFollowedByComment, unaryExpression.OperatorToken.GetLocation(), unaryExpression.OperatorToken.Text));
                 }