From f39da383a17b368e92fd243cf155b27ba42671f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 20:24:14 -0400
Subject: enable nullable annotations in SMAPI where no logic changes are
 needed (#837)

---
 .../Framework/Commands/HarmonySummaryCommand.cs      | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/SMAPI/Framework/Commands')

diff --git a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
index fcfa928e..6dc6f131 100644
--- a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
+++ b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -73,9 +71,9 @@ namespace StardewModdingAPI.Framework.Commands
         private IEnumerable<SearchResult> FilterPatches(string[] searchTerms)
         {
             bool hasSearch = searchTerms.Any();
-            bool IsMatch(string target) => !hasSearch || searchTerms.Any(search => target != null && target.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1);
+            bool IsMatch(string? target) => !hasSearch || searchTerms.Any(search => target != null && target.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1);
 
-            foreach (var patch in this.GetAllPatches())
+            foreach (SearchResult patch in this.GetAllPatches())
             {
                 // matches entire patch
                 if (IsMatch(patch.MethodDescription))
@@ -85,10 +83,10 @@ namespace StardewModdingAPI.Framework.Commands
                 }
 
                 // matches individual patchers
-                foreach (var pair in patch.PatchTypesByOwner.ToArray())
+                foreach ((string patcherId, ISet<PatchType> patchTypes) in patch.PatchTypesByOwner.ToArray())
                 {
-                    if (!IsMatch(pair.Key) && !pair.Value.Any(type => IsMatch(type.ToString())))
-                        patch.PatchTypesByOwner.Remove(pair.Key);
+                    if (!IsMatch(patcherId) && !patchTypes.Any(type => IsMatch(type.ToString())))
+                        patch.PatchTypesByOwner.Remove(patcherId);
                 }
 
                 if (patch.PatchTypesByOwner.Any())
@@ -114,13 +112,13 @@ namespace StardewModdingAPI.Framework.Commands
 
                 // get patch types by owner
                 var typesByOwner = new Dictionary<string, ISet<PatchType>>();
-                foreach (var group in patchGroups)
+                foreach ((PatchType type, IReadOnlyCollection<Patch> patches) in patchGroups)
                 {
-                    foreach (var patch in group.Value)
+                    foreach (Patch patch in patches)
                     {
-                        if (!typesByOwner.TryGetValue(patch.owner, out ISet<PatchType> patchTypes))
+                        if (!typesByOwner.TryGetValue(patch.owner, out ISet<PatchType>? patchTypes))
                             typesByOwner[patch.owner] = patchTypes = new HashSet<PatchType>();
-                        patchTypes.Add(group.Key);
+                        patchTypes.Add(type);
                     }
                 }
 
-- 
cgit