diff --git a/src/Analyzers/CSharp/Tests/UseCollectionExpression/UseCollectionExpressionForArrayTests.cs b/src/Analyzers/CSharp/Tests/UseCollectionExpression/UseCollectionExpressionForArrayTests.cs index 7d4b0c9e3756b..3c93313119888 100644 --- a/src/Analyzers/CSharp/Tests/UseCollectionExpression/UseCollectionExpressionForArrayTests.cs +++ b/src/Analyzers/CSharp/Tests/UseCollectionExpression/UseCollectionExpressionForArrayTests.cs @@ -312,7 +312,7 @@ class C string[] i = [""]; } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -327,7 +327,7 @@ class C string[,] i = new string[1, 1]; } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -342,7 +342,7 @@ class C string[,] i = new string[1, 1] { { "" } }; } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -357,7 +357,7 @@ class C string[,] i = new string[,] { { "" } }; } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -1950,8 +1950,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -1992,8 +1991,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2024,8 +2022,7 @@ void M() } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2045,8 +2042,7 @@ void M() } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2067,8 +2063,7 @@ void M() } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2091,8 +2086,7 @@ void M() int[] Goo(int[] input) => default; } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2113,8 +2107,7 @@ void M(int i) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2135,8 +2128,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2159,8 +2151,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2183,8 +2174,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2205,8 +2195,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2227,8 +2216,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2250,8 +2238,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2283,8 +2270,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2318,8 +2304,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2352,8 +2337,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2388,8 +2372,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2411,8 +2394,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2435,8 +2417,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2461,8 +2442,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2495,8 +2475,7 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } @@ -2540,8 +2519,63 @@ void M(int i, int j) } } """, - LanguageVersion = LanguageVersionExtensions.CSharpNext, - ReferenceAssemblies = ReferenceAssemblies.Net.Net70, + LanguageVersion = LanguageVersion.CSharp12, + }.RunAsync(); + } + + [Fact] + public async Task TestNoInitializer_TwoElement_TwoDimensional2_Trivia1() + { + await new VerifyCS.Test + { + TestCode = """ + using System; + + class C + { + void M(int i, int j) + { + int[][] r = [|[|new|] int[2][]|]; + + // Leading + r[0] = [|[|new|][]|] { 1 }; // Trailing + r[1] = [|[|new|] int[]|] { 2 }; + } + } + """, + FixedCode = """ + using System; + + class C + { + void M(int i, int j) + { + int[][] r = + [ + // Leading + new[] { 1 }, // Trailing + new int[] { 2 } + ]; + } + } + """, + BatchFixedCode = """ + using System; + + class C + { + void M(int i, int j) + { + int[][] r = + [ + // Leading + [1], // Trailing + [2] + ]; + } + } + """, + LanguageVersion = LanguageVersion.CSharp12, }.RunAsync(); } }