Merge pull request #3216 from pantosha/fix-2916

Update SA1118 to support multiline array creation

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1118UnitTests.cs

@@ -3,6 +3,7 @@
 
 namespace StyleCop.Analyzers.Test.ReadabilityRules
 {
+    using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.Testing;
@@ -12,6 +13,26 @@ namespace StyleCop.Analyzers.Test.ReadabilityRules
 
     public class SA1118UnitTests
     {
+        public static IEnumerable<object[]> ArrayCreationExpressions { get; } = new List<object[]>
+        {
+            new object[]
+            {
+                @"new[]
+                {
+                    0,
+                    1
+                }",
+            },
+            new object[]
+            {
+                @"new int[]
+                {
+                    0,
+                    1
+                }",
+            },
+        };
+
         [Fact]
         public async Task TestMethodCallWithTwoParametersSecondSpansMoreThanOneLineAsync()
         {
@@ -276,7 +297,7 @@ public void Bar()
         }
 
         [Fact]
-        public async Task TestLambdaCallSecondParameterIsAnonynousMethodAsync()
+        public async Task TestLambdaCallSecondParameterIsAnonymousMethodAsync()
         {
             var testCode = @"
 class Foo
@@ -341,7 +362,7 @@ public void Bar()
         }
 
         [Fact]
-        public async Task TestAttributeSecondParameterSpandsMultipleLinesAsync()
+        public async Task TestAttributeSecondParameterSpansMultipleLinesAsync()
         {
             var testCode = @"
 [System.AttributeUsage(System.AttributeTargets.Class,AllowMultiple = true)]
@@ -363,5 +384,27 @@ public class Foo
 
             await VerifyCSharpDiagnosticAsync(testCode, expected, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Theory]
+        [MemberData(nameof(ArrayCreationExpressions))]
+        public async Task TestArrayCreationSpansMultipleLinesAsync(string arrayCreationExpression)
+        {
+            var testCode = $@"
+class Foo
+{{
+    public void Fun(int i, int[] j)
+    {{
+    }}
+
+    public void Bar()
+    {{
+        Fun(
+            1,
+            {arrayCreationExpression});
+    }}
+}}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1118ParameterMustNotSpanMultipleLines.cs

@@ -80,6 +80,8 @@ internal class SA1118ParameterMustNotSpanMultipleLines : DiagnosticAnalyzer
             SyntaxKind.InvocationExpression,
             SyntaxKind.ObjectCreationExpression,
             SyntaxKind.AnonymousObjectCreationExpression,
+            SyntaxKind.ArrayCreationExpression,
+            SyntaxKind.ImplicitArrayCreationExpression,
         };
 
         /// <inheritdoc/>
@@ -131,10 +133,10 @@ private static bool CheckIfArgumentIsMultiline(CSharpSyntaxNode argument)
             return lineSpan.EndLinePosition.Line > lineSpan.StartLinePosition.Line;
         }
 
-        private static bool IsArgumentOnExceptionList(ExpressionSyntax argumentExpresson)
+        private static bool IsArgumentOnExceptionList(ExpressionSyntax argumentExpression)
         {
-            return argumentExpresson != null
-                && ArgumentExceptionSyntaxKinds.Any(argumentExpresson.IsKind);
+            return argumentExpression != null
+                && ArgumentExceptionSyntaxKinds.Any(argumentExpression.IsKind);
         }
     }
 }