Merge branch 'develop' into stable

1 files changed, 6 insertions, 5 deletions

diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 67569298..73d5b79d 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -1,18 +1,20 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list items available to spawn.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ListItemsCommand : ConsoleCommand
     {
         /*********
         ** Fields
         *********/
         /// <summary>Provides methods for searching and constructing items.</summary>
-        private readonly ItemRepository Items = new ItemRepository();
+        private readonly ItemRepository Items = new();
 
 
         /*********
@@ -59,15 +61,14 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
         private IEnumerable<SearchableItem> GetItems(string[] searchWords)
         {
             // normalize search term
-            searchWords = searchWords?.Where(word => !string.IsNullOrWhiteSpace(word)).ToArray();
-            if (searchWords?.Any() == false)
-                searchWords = null;
+            searchWords = searchWords.Where(word => !string.IsNullOrWhiteSpace(word)).ToArray();
+            bool getAll = !searchWords.Any();
 
             // find matches
             return (
                 from item in this.Items.GetAll()
                 let term = $"{item.ID}|{item.Type}|{item.Name}|{item.DisplayName}"
-                where searchWords == null || searchWords.All(word => term.IndexOf(word, StringComparison.CurrentCultureIgnoreCase) != -1)
+                where getAll || searchWords.All(word => term.IndexOf(word, StringComparison.CurrentCultureIgnoreCase) != -1)
                 select item
             );
         }