From 1070761192c4f447738b4288a75bc050d2633873 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sat, 28 Mar 2026 23:52:50 -0400 Subject: [PATCH] prefer empty collection expression --- .../Framework/DiagnosticResult.cs | 2 +- .../Framework/DiagnosticVerifier.Helper.cs | 2 +- .../Framework/DiagnosticVerifier.cs | 2 +- src/SMAPI.Tests/Core/ModResolverTests.cs | 2 +- src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs | 2 +- src/SMAPI.Web/Controllers/ModsApiController.cs | 2 +- src/SMAPI/Framework/Networking/MultiplayerPeer.cs | 2 +- src/SMAPI/Framework/SCore.cs | 2 +- .../StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs | 4 ++-- src/SMAPI/Framework/StateTracking/LocationTracker.cs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs index 8cbce4f6..2dd2d87d 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs +++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs @@ -45,7 +45,7 @@ public struct DiagnosticResult { if (this.locations == null) { - this.locations = new DiagnosticResultLocation[] { }; + this.locations = []; } return this.locations; } diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs index f0d8ae40..16815e10 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs +++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs @@ -61,7 +61,7 @@ public abstract partial class DiagnosticVerifier var diagnostics = new List(); foreach (Project project in projects) { - CompilationWithAnalyzers compilationWithAnalyzers = project.GetCompilationAsync().Result!.WithAnalyzers(ImmutableArray.Create(analyzer)); + CompilationWithAnalyzers compilationWithAnalyzers = project.GetCompilationAsync().Result!.WithAnalyzers([analyzer]); var diags = compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync().Result; foreach (Diagnostic diag in diags) { diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs index ad75c62b..dd9078bf 100644 --- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs +++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs @@ -32,7 +32,7 @@ public abstract partial class DiagnosticVerifier /// DiagnosticResults that should appear after the analyzer is run on the source protected void VerifyCSharpDiagnostic(string source, params DiagnosticResult[] expected) { - this.VerifyDiagnostics(new[] { source }, LanguageNames.CSharp, this.GetCSharpDiagnosticAnalyzer(), expected); + this.VerifyDiagnostics([source], LanguageNames.CSharp, this.GetCSharpDiagnosticAnalyzer(), expected); } /// diff --git a/src/SMAPI.Tests/Core/ModResolverTests.cs b/src/SMAPI.Tests/Core/ModResolverTests.cs index 6314c843..247ee2da 100644 --- a/src/SMAPI.Tests/Core/ModResolverTests.cs +++ b/src/SMAPI.Tests/Core/ModResolverTests.cs @@ -263,7 +263,7 @@ public class ModResolverTests public void ProcessDependencies_NoMods_DoesNothing() { // act - IModMetadata[] mods = new ModResolver().ProcessDependencies(Array.Empty(), new ModDatabase()).ToArray(); + IModMetadata[] mods = new ModResolver().ProcessDependencies([], new ModDatabase()).ToArray(); // assert mods.Should().BeEmpty("it should match number of mods input"); diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs index 221fa776..cfd2787d 100644 --- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs +++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs @@ -22,7 +22,7 @@ public class ModDatabase *********/ /// Construct an empty instance. public ModDatabase() - : this(Array.Empty(), _ => null) { } + : this([], _ => null) { } /// Construct an instance. /// The underlying mod data records indexed by default display name. diff --git a/src/SMAPI.Web/Controllers/ModsApiController.cs b/src/SMAPI.Web/Controllers/ModsApiController.cs index 6a560dce..911d48b5 100644 --- a/src/SMAPI.Web/Controllers/ModsApiController.cs +++ b/src/SMAPI.Web/Controllers/ModsApiController.cs @@ -86,7 +86,7 @@ internal class ModsApiController : Controller metrics.TrackRequest(model?.ApiVersion, model?.GameVersion, model?.Platform); if (model?.Mods == null) - return Array.Empty(); + return []; ModUpdateCheckConfig config = this.Config.Value; diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs index b5317c28..59571322 100644 --- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs +++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs @@ -69,7 +69,7 @@ internal class MultiplayerPeer : IMultiplayerPeer this.Mods = model.Mods.Select(mod => new MultiplayerPeerMod(mod)).ToArray(); } else - this.Mods = Array.Empty(); + this.Mods = []; this.SendMessageImpl = sendMessage; } diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs index bf701f7d..7e64dd16 100644 --- a/src/SMAPI/Framework/SCore.cs +++ b/src/SMAPI/Framework/SCore.cs @@ -1627,7 +1627,7 @@ internal class SCore : IDisposable { using RegistryKey? key = Registry.LocalMachine.OpenSubKey(registryKey); if (key == null) - return Array.Empty(); + return []; return key .GetSubKeyNames() diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs index 660f228e..7f4c2e72 100644 --- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs +++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs @@ -20,10 +20,10 @@ internal class ImmutableCollectionWatcher : BaseDisposableWatcher, IColl public bool IsChanged { get; } = false; /// - public IEnumerable Added { get; } = Array.Empty(); + public IEnumerable Added { get; } = []; /// - public IEnumerable Removed { get; } = Array.Empty(); + public IEnumerable Removed { get; } = []; /********* diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs index 91a4e582..bb77810e 100644 --- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs +++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs @@ -89,7 +89,7 @@ internal class LocationTracker : IWatcher this.FurnitureWatcher ]); - this.UpdateChestWatcherList(added: location.Objects.Pairs, removed: Array.Empty>()); + this.UpdateChestWatcherList(added: location.Objects.Pairs, removed: []); } ///