Merge branch 'master' into issue2575

# Conflicts:
#	azure-pipelines.yml

Author: MartyIX

.nuget/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Codecov" version="1.9.0" />
+  <package id="CodecovUploader" version="0.7.1" />
   <package id="OpenCover" version="4.6.519" />
-  <package id="ReportGenerator" version="2.3.5.0" targetFramework="net452" />
+  <package id="ReportGenerator" version="5.2.0" />
   <package id="xunit.runner.console" version="2.4.1" />
 </packages>

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/LayoutRules/SA1513CSharp12UnitTests.cs

@@ -3,9 +3,34 @@
 
 namespace StyleCop.Analyzers.Test.CSharp12.LayoutRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp11.LayoutRules;
+    using Xunit;
+
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.LayoutRules.SA1513ClosingBraceMustBeFollowedByBlankLine,
+        StyleCop.Analyzers.LayoutRules.SA1513CodeFixProvider>;
 
     public partial class SA1513CSharp12UnitTests : SA1513CSharp11UnitTests
     {
+        [Fact]
+        [WorkItem(3720, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3720")]
+        public async Task TestObjectInitializerInCollectionExpressionAsync()
+        {
+            var testCode = @"
+public class Foo
+{
+    public Foo[] TestMethod() =>
+    [
+        new Foo
+        {
+        }
+    ];
+}";
+
+            await VerifyCSharpFixAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, testCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/ReadabilityRules/SA1118CSharp12UnitTests.cs

@@ -3,9 +3,41 @@
 
 namespace StyleCop.Analyzers.Test.CSharp12.ReadabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp11.ReadabilityRules;
+    using Xunit;
+
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopDiagnosticVerifier<
+        StyleCop.Analyzers.ReadabilityRules.SA1118ParameterMustNotSpanMultipleLines>;
 
     public partial class SA1118CSharp12UnitTests : SA1118CSharp11UnitTests
     {
+        [Fact]
+        [WorkItem(3732, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3732")]
+        public async Task TestCollectionExpressionAsync()
+        {
+            var testCode = @"
+class Foo
+{
+    public void TestMethod()
+    {
+        AnotherMethod(
+            42,
+            [
+                1,
+                2,
+                3
+            ]);
+    }
+
+    public void AnotherMethod(int x, int[] y)
+    {
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp12/SpacingRules/SA1010CSharp12UnitTests.cs

@@ -3,9 +3,47 @@
 
 namespace StyleCop.Analyzers.Test.CSharp12.SpacingRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp11.SpacingRules;
+    using Xunit;
+
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.SpacingRules.SA1010OpeningSquareBracketsMustBeSpacedCorrectly,
+        StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;
 
     public partial class SA1010CSharp12UnitTests : SA1010CSharp11UnitTests
     {
+        [Fact]
+        [WorkItem(3687, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3687")]
+        public async Task TestCollectionExpressionAsync()
+        {
+            var testCode = $@"
+using System.Collections.Generic;
+
+namespace TestNamespace
+{{
+    public class TestClass
+    {{
+        protected static readonly int[] DefaultMetadataPaths = [1, 2];
+
+        public void TestMethod(List<int> x, int y)
+        {{
+            List<int> foo = [];
+            foo = [42];
+            foo = [..x, y];
+            Bar([1 ,2, 3]);
+        }}
+        
+        public void Bar(int[] x)
+        {{
+        }}
+    }}
+}}
+";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/LayoutRules/SA1513ClosingBraceMustBeFollowedByBlankLine.cs

@@ -272,6 +272,12 @@ private void AnalyzeCloseBrace(SyntaxToken token)
                         return;
                     }
 
+                    if (nextToken.IsKind(SyntaxKind.CloseBracketToken))
+                    {
+                        // the close brace is for example in an object initializer at the end of a collection expression.
+                        return;
+                    }
+
                     if (nextToken.IsKind(SyntaxKind.AddKeyword)
                         || nextToken.IsKind(SyntaxKind.RemoveKeyword)
                         || nextToken.IsKind(SyntaxKind.GetKeyword)

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/SyntaxKindEx.cs

@@ -69,5 +69,6 @@ internal static class SyntaxKindEx
         public const SyntaxKind RecordDeclaration = (SyntaxKind)9063;
         public const SyntaxKind FunctionPointerUnmanagedCallingConventionList = (SyntaxKind)9066;
         public const SyntaxKind RecordStructDeclaration = (SyntaxKind)9068;
+        public const SyntaxKind CollectionExpression = (SyntaxKind)9076;
     }
 }

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

@@ -87,6 +87,7 @@ internal class SA1118ParameterMustNotSpanMultipleLines : DiagnosticAnalyzer
             SyntaxKind.ImplicitArrayCreationExpression,
             SyntaxKindEx.WithExpression,
             SyntaxKindEx.ImplicitObjectCreationExpression,
+            SyntaxKindEx.CollectionExpression,
         };
 
         /// <inheritdoc/>

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1010OpeningSquareBracketsMustBeSpacedCorrectly.cs

@@ -100,7 +100,7 @@ private static void HandleOpenBracketToken(SyntaxTreeAnalysisContext context, Sy
             }
 
             if (!firstInLine && precededBySpace && !ignorePrecedingSpaceProblem &&
-                !IsPartOfIndexInitializer(token) && !IsPartOfListPattern(token))
+                !IsPartOfIndexInitializer(token) && !IsPartOfListPattern(token) && !IsPartOfCollectionExpression(token))
             {
                 // Opening square bracket should {not be preceded} by a space.
                 context.ReportDiagnostic(Diagnostic.Create(DescriptorNotPreceded, token.GetLocation(), TokenSpacingProperties.RemovePreceding));
@@ -128,5 +128,10 @@ private static bool IsPartOfListPattern(SyntaxToken token)
         {
             return token.Parent.IsKind(SyntaxKindEx.ListPattern);
         }
+
+        private static bool IsPartOfCollectionExpression(SyntaxToken token)
+        {
+            return token.Parent.IsKind(SyntaxKindEx.CollectionExpression);
+        }
     }
 }

azure-pipelines.yml

@@ -1,80 +1,16 @@
-pool:
+pool:
   name: Azure Pipelines
   vmImage: windows-latest
   demands:
   - msbuild
   - visualstudio
   - vstest
 
-jobs:
-- job: Build
-  variables:
-    BuildSolution: StyleCopAnalyzers.sln
-    BuildPlatform: Any CPU
-  strategy:
-    matrix:
-      Debug:
-        BuildConfiguration: Debug
-        _debugArg: '-Debug'
-      Release:
-        BuildConfiguration: Release
-        _debugArg: ''
-  timeoutInMinutes: 90
-  steps:
-  - powershell: .\init.ps1 -NoRestore
-    displayName: Install .NET Core SDK
+stages:
+- template: build/build-and-test.yml
+  parameters:
+    BuildConfiguration: Debug
 
-  - task: NuGetToolInstaller@0
-    displayName: 'Use NuGet 5.3.1'
-    inputs:
-      versionSpec: 5.3.1
-
-  - task: NuGetCommand@2
-    displayName: 'NuGet restore'
-    inputs:
-      restoreSolution: '$(BuildSolution)'
-      feedsToUse: 'config'
-      nugetConfigPath: 'NuGet.config'
-
-  - task: VSBuild@1
-    displayName: 'Build solution StyleCopAnalyzers.sln'
-    inputs:
-      solution: '$(BuildSolution)'
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      msbuildArgs: '/bl:$(Build.SourcesDirectory)/msbuild.binlog'
-
-  - task: PowerShell@2
-    displayName: Run Tests
-    timeoutInMinutes: 80
-    inputs:
-      workingDirectory: '$(Build.SourcesDirectory)/build'
-      filePath: build/opencover-report.ps1
-      arguments: '$(_debugArg) -NoBuild -NoReport -Azure'
-
-  - task: PublishTestResults@2
-    displayName: Publish test results
-    condition: always()
-    inputs:
-      testResultsFormat: xUnit
-      testResultsFiles: 'build/*.xml'
-      mergeTestResults: true
-      testRunTitle: '$(BuildConfiguration)'
-
-  - task: PowerShell@2
-    displayName: Upload coverage reports to codecov.io
-    condition: eq(variables['BuildConfiguration'], 'Debug')
-    inputs:
-      workingDirectory: '$(Build.SourcesDirectory)/build'
-      targetType: inline
-      script: |
-        $packageConfig = [xml](Get-Content ..\.nuget\packages.config)
-        $codecov_version = $packageConfig.SelectSingleNode('/packages/package[@id="Codecov"]').version
-        $codecov = "..\packages\Codecov.$codecov_version\tools\codecov.exe"
-        &$codecov -f '..\build\OpenCover.Reports\OpenCover.StyleCopAnalyzers.xml' --required
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish build logs
-    inputs:
-      pathtoPublish: msbuild.binlog
-    condition: failed()
+- template: build/build-and-test.yml
+  parameters:
+    BuildConfiguration: Release