From c3851ae2e6c8fb286d4744612fbfea039d1baf7f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Tue, 12 Apr 2022 19:56:52 -0400
Subject: enable nullable annotations in shared projects (#837)

---
 .../ConsoleWriting/ColorSchemeConfig.cs            | 22 ++++++++++++++++++----
 .../ConsoleWriting/ColorfulConsoleWriter.cs        | 19 +++++++++----------
 .../ConsoleWriting/IConsoleWriter.cs               |  2 --
 3 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'src/SMAPI.Internal/ConsoleWriting')

diff --git a/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs b/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
index b22aa231..4e5850ea 100644
--- a/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
@@ -8,10 +6,26 @@ namespace StardewModdingAPI.Internal.ConsoleWriting
     /// <summary>The console color scheme options.</summary>
     internal class ColorSchemeConfig
     {
+        /*********
+        ** Accessors
+        *********/
         /// <summary>The default color scheme ID to use, or <see cref="MonitorColorScheme.AutoDetect"/> to select one automatically.</summary>
-        public MonitorColorScheme UseScheme { get; set; }
+        public MonitorColorScheme UseScheme { get; }
 
         /// <summary>The available console color schemes.</summary>
-        public IDictionary<MonitorColorScheme, IDictionary<ConsoleLogLevel, ConsoleColor>> Schemes { get; set; }
+        public IDictionary<MonitorColorScheme, IDictionary<ConsoleLogLevel, ConsoleColor>> Schemes { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="useScheme">The default color scheme ID to use, or <see cref="MonitorColorScheme.AutoDetect"/> to select one automatically.</param>
+        /// <param name="schemes">The available console color schemes.</param>
+        public ColorSchemeConfig(MonitorColorScheme useScheme, IDictionary<MonitorColorScheme, IDictionary<ConsoleLogLevel, ConsoleColor>> schemes)
+        {
+            this.UseScheme = useScheme;
+            this.Schemes = schemes;
+        }
     }
 }
diff --git a/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs b/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
index 19a31c7b..78db0d65 100644
--- a/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using StardewModdingAPI.Toolkit.Utilities;
 
 namespace StardewModdingAPI.Internal.ConsoleWriting
@@ -13,10 +12,11 @@ namespace StardewModdingAPI.Internal.ConsoleWriting
         ** Fields
         *********/
         /// <summary>The console text color for each log level.</summary>
-        private readonly IDictionary<ConsoleLogLevel, ConsoleColor> Colors;
+        private readonly IDictionary<ConsoleLogLevel, ConsoleColor>? Colors;
 
         /// <summary>Whether the current console supports color formatting.</summary>
-        private readonly bool SupportsColor;
+        [MemberNotNullWhen(true, nameof(ColorfulConsoleWriter.Colors))]
+        private bool SupportsColor { get; }
 
 
         /*********
@@ -74,10 +74,9 @@ namespace StardewModdingAPI.Internal.ConsoleWriting
         /// <remarks>The colors here should be kept in sync with the SMAPI config file.</remarks>
         public static ColorSchemeConfig GetDefaultColorSchemeConfig(MonitorColorScheme useScheme)
         {
-            return new ColorSchemeConfig
-            {
-                UseScheme = useScheme,
-                Schemes = new Dictionary<MonitorColorScheme, IDictionary<ConsoleLogLevel, ConsoleColor>>
+            return new ColorSchemeConfig(
+                useScheme: useScheme,
+                schemes: new Dictionary<MonitorColorScheme, IDictionary<ConsoleLogLevel, ConsoleColor>>
                 {
                     [MonitorColorScheme.DarkBackground] = new Dictionary<ConsoleLogLevel, ConsoleColor>
                     {
@@ -100,7 +99,7 @@ namespace StardewModdingAPI.Internal.ConsoleWriting
                         [ConsoleLogLevel.Success] = ConsoleColor.DarkGreen
                     }
                 }
-            };
+            );
         }
 
 
@@ -136,7 +135,7 @@ namespace StardewModdingAPI.Internal.ConsoleWriting
             }
 
             // get colors for scheme
-            return colorConfig.Schemes.TryGetValue(schemeID, out IDictionary<ConsoleLogLevel, ConsoleColor> scheme)
+            return colorConfig.Schemes.TryGetValue(schemeID, out IDictionary<ConsoleLogLevel, ConsoleColor>? scheme)
                 ? scheme
                 : throw new NotSupportedException($"Unknown color scheme '{schemeID}'.");
         }
diff --git a/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs b/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
index 84e17207..fbcf161c 100644
--- a/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Internal.ConsoleWriting
 {
     /// <summary>Writes text to the console.</summary>
-- 
cgit