Merge pull request #1887 from oatkins/SA1115-ParameterMustBeginOnNextLine-Fix

Fix for bug in SA1115 (Parameter must begin on next line fix) #1886

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1115UnitTests.cs

@@ -179,6 +179,31 @@ public void Baz()
             await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task TestMethodCallPragmaDirectiveBetweenParametersAsync()
+        {
+            var testCode = @"
+class Foo
+{
+    public void Bar(int i, int z)
+    {
+    }
+
+    public void Baz()
+    {
+        Bar(
+#pragma warning disable CS4014
+            1,
+#pragma warning restore CS4014
+            2);
+    }
+}";
+
+            DiagnosticResult[] expected = EmptyDiagnosticResults;
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
+        }
+
         [Fact]
         public async Task TestMethodCallSecondParameterOnTheNextLineAsync()
         {

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1115ParameterMustFollowComma.cs

@@ -270,18 +270,32 @@ private static void AnalyzeArgumentList(SyntaxNodeAnalysisContext context, BaseA
                 return;
             }
 
-            var previousLine = argumentListSyntax.Arguments[0].GetLineSpan().EndLinePosition.Line;
+            var previousArgumentLine = argumentListSyntax.Arguments[0].GetLineSpan().EndLinePosition.Line;
             for (int i = 1; i < argumentListSyntax.Arguments.Count; i++)
             {
                 var currentArgument = argumentListSyntax.Arguments[i];
-                var lineSpan = currentArgument.GetLineSpan();
-                var currentLine = lineSpan.StartLinePosition.Line;
-                if (currentLine - previousLine > 1)
+                int currentArgumentStartLine;
+                int currentArgumentEndLine;
+
+                if (currentArgument.HasLeadingTrivia && currentArgument.GetLeadingTrivia().All(trivia => IsValidTrivia(trivia)))
+                {
+                    var lineSpan = currentArgument.SyntaxTree.GetLineSpan(currentArgument.FullSpan);
+                    currentArgumentStartLine = lineSpan.StartLinePosition.Line;
+                    currentArgumentEndLine = lineSpan.EndLinePosition.Line;
+                }
+                else
+                {
+                    var lineSpan = currentArgument.GetLineSpan();
+                    currentArgumentStartLine = lineSpan.StartLinePosition.Line;
+                    currentArgumentEndLine = lineSpan.EndLinePosition.Line;
+                }
+
+                if (currentArgumentStartLine - previousArgumentLine > 1)
                 {
                     context.ReportDiagnostic(Diagnostic.Create(Descriptor, currentArgument.GetLocation()));
                 }
 
-                previousLine = lineSpan.EndLinePosition.Line;
+                previousArgumentLine = currentArgumentEndLine;
             }
         }
 
@@ -319,12 +333,13 @@ private static void AnalyzeParameterList(SyntaxNodeAnalysisContext context, Base
 
         private static bool IsValidTrivia(SyntaxTrivia trivia)
         {
+            if (trivia.IsDirective)
+            {
+                return true;
+            }
+
             switch (trivia.Kind())
             {
-            case SyntaxKind.IfDirectiveTrivia:
-            case SyntaxKind.ElseDirectiveTrivia:
-            case SyntaxKind.ElifDirectiveTrivia:
-            case SyntaxKind.EndIfDirectiveTrivia:
             case SyntaxKind.DisabledTextTrivia:
             case SyntaxKind.WhitespaceTrivia:
                 return true;