From d706a25053cdc5d9f1ccc2c09dc3913f835c3f78 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 Apr 2022 02:33:23 -0400
Subject: enable nullable annotations for most of the SMAPI toolkit (#837)

---
 src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs  | 14 ++++++--------
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework/ModScanning')

diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
index 81d72c0b..da2a3c85 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,13 +22,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         public ModType Type { get; }
 
         /// <summary>The mod manifest.</summary>
-        public Manifest Manifest { get; }
+        public Manifest? Manifest { get; }
 
         /// <summary>The error which occurred parsing the manifest, if any.</summary>
         public ModParseError ManifestParseError { get; set; }
 
         /// <summary>A human-readable message for the <see cref="ManifestParseError"/>, if any.</summary>
-        public string ManifestParseErrorText { get; set; }
+        public string? ManifestParseErrorText { get; set; }
 
 
         /*********
@@ -51,7 +49,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         /// <param name="manifest">The mod manifest.</param>
         /// <param name="manifestParseError">The error which occurred parsing the manifest, if any.</param>
         /// <param name="manifestParseErrorText">A human-readable message for the <paramref name="manifestParseError"/>, if any.</param>
-        public ModFolder(DirectoryInfo root, DirectoryInfo directory, ModType type, Manifest manifest, ModParseError manifestParseError, string manifestParseErrorText)
+        public ModFolder(DirectoryInfo root, DirectoryInfo directory, ModType type, Manifest? manifest, ModParseError manifestParseError, string? manifestParseErrorText)
         {
             // save info
             this.Directory = directory;
@@ -61,9 +59,9 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             this.ManifestParseErrorText = manifestParseErrorText;
 
             // set display name
-            this.DisplayName = manifest?.Name;
-            if (string.IsNullOrWhiteSpace(this.DisplayName))
-                this.DisplayName = PathUtilities.GetRelativePath(root.FullName, directory.FullName);
+            this.DisplayName = !string.IsNullOrWhiteSpace(manifest?.Name)
+                ? manifest.Name
+                : PathUtilities.GetRelativePath(root.FullName, directory.FullName);
         }
 
         /// <summary>Get the update keys for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index 621f1e28..2af30092 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -117,7 +115,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         public ModFolder ReadFolder(DirectoryInfo root, DirectoryInfo searchFolder)
         {
             // find manifest.json
-            FileInfo manifestFile = this.FindManifest(searchFolder);
+            FileInfo? manifestFile = this.FindManifest(searchFolder);
 
             // set appropriate invalid-mod error
             if (manifestFile == null)
@@ -147,13 +145,13 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             }
 
             // read mod info
-            Manifest manifest = null;
+            Manifest? manifest = null;
             ModParseError error = ModParseError.None;
-            string errorText = null;
+            string? errorText = null;
             {
                 try
                 {
-                    if (!this.JsonHelper.ReadJsonFileIfExists<Manifest>(manifestFile.FullName, out manifest) || manifest == null)
+                    if (!this.JsonHelper.ReadJsonFileIfExists<Manifest>(manifestFile.FullName, out manifest))
                     {
                         error = ModParseError.ManifestInvalid;
                         errorText = "its manifest is invalid.";
@@ -186,7 +184,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             }
 
             // build result
-            return new ModFolder(root, manifestFile.Directory, type, manifest, error, errorText);
+            return new ModFolder(root, manifestFile.Directory!, type, manifest, error, errorText);
         }
 
 
@@ -249,7 +247,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
 
         /// <summary>Find the manifest for a mod folder.</summary>
         /// <param name="folder">The folder to search.</param>
-        private FileInfo FindManifest(DirectoryInfo folder)
+        private FileInfo? FindManifest(DirectoryInfo folder)
         {
             while (true)
             {
-- 
cgit