Merge branch 'useCollectionExpr2' into useCollectionExpr

Author: CyrusNajmabadi

src/Analyzers/CSharp/Analyzers/MakeStructMemberReadOnly/CSharpMakeStructMemberReadOnlyAnalyzer.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
@@ -140,7 +141,7 @@ private void AnalyzeBlock(
             return;
 
         var (location, additionalLocation) = GetDiagnosticLocation(owningMethod, cancellationToken);
-        if (location == null || additionalLocation is null || !context.ShouldAnalyzeSpan(location.SourceSpan))
+        if (location == null || additionalLocation == null || !context.ShouldAnalyzeSpan(location.SourceSpan))
             return;
 
         foreach (var blockOperation in context.OperationBlocks)

src/EditorFeatures/CSharpTest/Formatting/RazorLineFormattingOptionsTests.cs

@@ -57,7 +57,7 @@ void F   () {}
         var documentInfo = DocumentInfo.Create(
             DocumentId.CreateNewId(project.Id),
             name: "file.razor.g.cs",
-            folders: Array.Empty<string>(),
+            folders: [],
             sourceCodeKind: SourceCodeKind.Regular,
             loader: TextLoader.From(TextAndVersion.Create(sourceText, VersionStamp.Create(), "file.razor.g.cs")),
             filePath: "file.razor.g.cs")

src/EditorFeatures/Test/Completion/FileSystemCompletionHelperTests.cs

@@ -161,7 +161,7 @@ public void GetItems_Windows_Network()
             searchPaths: [],
             baseDirectoryOpt: null,
             allowableExtensions: [".cs"],
-            drives: Array.Empty<string>(),
+            drives: [],
             directories: new[]
             {
                 @"\\server\share",
@@ -191,7 +191,7 @@ public void GetItems_Unix1()
             searchPaths: [@"/A", @"/B"],
             baseDirectoryOpt: @"/C",
             allowableExtensions: [".abc", ".def"],
-            drives: Array.Empty<string>(),
+            drives: [],
             directories: new[]
             {
                 @"/A",

src/EditorFeatures/Test/Utilities/SymbolEquivalenceComparerTests.cs

@@ -1830,8 +1830,8 @@ .method public instance int32[] F(                                         // 3
             r2 = MetadataReference.CreateFromImage(bytes);
         }
 
-        var c1 = (Compilation)CS.CSharpCompilation.Create("comp1", Array.Empty<SyntaxTree>(), [NetFramework.mscorlib, r1]);
-        var c2 = (Compilation)CS.CSharpCompilation.Create("comp2", Array.Empty<SyntaxTree>(), [NetFramework.mscorlib, r2]);
+        var c1 = (Compilation)CS.CSharpCompilation.Create("comp1", [], [NetFramework.mscorlib, r1]);
+        var c2 = (Compilation)CS.CSharpCompilation.Create("comp2", [], [NetFramework.mscorlib, r2]);
         var type1 = (ITypeSymbol)c1.GlobalNamespace.GetMembers("C").Single();
         var type2 = (ITypeSymbol)c2.GlobalNamespace.GetMembers("C").Single();
 

src/Features/TestUtilities/EditAndContinue/EditAndContinueWorkspaceTestBase.cs

@@ -368,7 +368,7 @@ internal static DocumentInfo CreateDesignTimeOnlyDocument(ProjectId projectId, s
         return DocumentInfo.Create(
             DocumentId.CreateNewId(projectId, name),
             name: name,
-            folders: Array.Empty<string>(),
+            folders: [],
             sourceCodeKind: SourceCodeKind.Regular,
             loader: TextLoader.From(TextAndVersion.Create(sourceText, VersionStamp.Create(), path)),
             filePath: path,

src/Test/PdbUtilities/EditAndContinue/EditAndContinueTest.GenerationVerifier.cs

@@ -83,39 +83,39 @@ internal void VerifyEncLog(IEnumerable<EditAndContinueLogEntry>? expected = null
                 => Verify(() =>
                 {
                     AssertEx.Equal(
-                        expected ?? Array.Empty<EditAndContinueLogEntry>(),
+                        expected ?? [],
                         MetadataReader.GetEditAndContinueLogEntries(), itemInspector: EncLogRowToString, message: GetAssertMessage("EncLog doesn't match"));
                 });
 
             internal void VerifyEncMap(IEnumerable<EntityHandle>? expected = null)
                 => Verify(() =>
                 {
                     AssertEx.Equal(
-                        expected ?? Array.Empty<EntityHandle>(),
+                        expected ?? [],
                         MetadataReader.GetEditAndContinueMapEntries(), itemInspector: EncMapRowToString, message: GetAssertMessage("EncMap doesn't match"));
                 });
 
             internal void VerifyEncLogDefinitions(IEnumerable<EditAndContinueLogEntry>? expected = null)
                 => Verify(() =>
                 {
                     AssertEx.Equal(
-                        expected ?? Array.Empty<EditAndContinueLogEntry>(),
+                        expected ?? [],
                         MetadataReader.GetEditAndContinueLogEntries().Where(e => IsDefinition(e.Handle.Kind)), itemInspector: EncLogRowToString, message: GetAssertMessage("EncLog definitions don't match"));
                 });
 
             internal void VerifyEncMapDefinitions(IEnumerable<EntityHandle>? expected = null)
                 => Verify(() =>
                 {
                     AssertEx.Equal(
-                        expected ?? Array.Empty<EntityHandle>(),
+                        expected ?? [],
                         MetadataReader.GetEditAndContinueMapEntries().Where(e => IsDefinition(e.Kind)), itemInspector: EncMapRowToString, message: GetAssertMessage("EncMap definitions don't match"));
                 });
 
             internal void VerifyCustomAttributes(IEnumerable<CustomAttributeRow>? expected = null)
                 => Verify(() =>
                 {
                     AssertEx.Equal(
-                        expected ?? Array.Empty<CustomAttributeRow>(),
+                        expected ?? [],
                         MetadataReader.GetCustomAttributeRows(), itemInspector: AttributeRowToString);
                 });
 

src/VisualStudio/CSharp/Test/DocumentOutline/DocumentOutlineTests.cs

@@ -96,7 +96,7 @@ static ImmutableArray<DocumentSymbolDataViewModel> Sort(ImmutableArray<DocumentS
             static DocumentSymbolDataViewModel ReplaceChildren(DocumentSymbolDataViewModel symbolToUpdate, ImmutableArray<DocumentSymbolDataViewModel> newChildren)
             {
                 var data = symbolToUpdate.Data;
-                var symbolData = data with { Children = ImmutableArray<DocumentSymbolData>.Empty };
+                var symbolData = data with { Children = [] };
                 return new DocumentSymbolDataViewModel(symbolData, newChildren);
             }
 

src/VisualStudio/CSharp/Test/EditorConfigSettings/DataProvider/DataProviderTests.MockAnalyzerReference.cs

@@ -50,7 +50,7 @@ public override ImmutableArray<DiagnosticAnalyzer> GetAnalyzersForAllLanguages()
                 => Analyzers;
 
             public ImmutableArray<CodeFixProvider> GetFixers()
-                => Fixer != null ? [Fixer] : ImmutableArray<CodeFixProvider>.Empty;
+                => Fixer != null ? [Fixer] : [];
 
             public class MockFixer : CodeFixProvider
             {

src/VisualStudio/Core/Def/EditAndContinue/EditAndContinueFeedbackDiagnosticFileProvider.cs

@@ -98,7 +98,7 @@ private string GetZipFilePath()
 
     public IReadOnlyCollection<string> GetFiles()
         => _vsFeedbackSemaphoreFileWatcher is null
-           ? Array.Empty<string>()
+           ? []
            : (IReadOnlyCollection<string>)([GetZipFilePath()]);
 
     private void OnFeedbackSemaphoreCreatedOrChanged()

src/VisualStudio/Core/Def/EditorConfigSettings/SettingsEditorPane.SearchFilter.cs

@@ -20,7 +20,7 @@ internal class SearchFilter : IEntryFilter
         public SearchFilter(IVsSearchQuery searchQuery, IWpfTableControl control)
         {
             _searchTokens = SearchUtilities.ExtractSearchTokens(searchQuery);
-            _searchTokens ??= Array.Empty<IVsSearchToken>();
+            _searchTokens ??= [];
 
             var newVisibleColumns = new List<ITableColumnDefinition>();
             foreach (var c in control.ColumnStates)