Revert "Improve nullability of OrDefault"

This reverts commit 9d1d061.
YarnSpinnerTool · Dec 16, 2023 · 350f4a9 · 350f4a9
1 parent 76687e1
commit 350f4a9
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/YarnSpinner.LanguageServer/src/Server/Utils/Utils.cs b/YarnSpinner.LanguageServer/src/Server/Utils/Utils.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
 namespace YarnLanguageServer
 {
@@ -31,16 +30,12 @@ internal static class Utils
             Title = "editor.action.triggerParameterHints",
         };
 
-        [return: NotNullIfNotNull(nameof(@default))]
-        [return: NotNullIfNotNull(nameof(str))]
-        public static string? OrDefault(this string? str,  string? @default = default)
+        public static string OrDefault(this string str, string @default = default)
         {
             return string.IsNullOrEmpty(str) ? @default : str;
         }
 
-        [return: NotNullIfNotNull(nameof(@default))]
-        [return: NotNullIfNotNull(nameof(str))]
-        public static object? OrDefault(this string? str, object? @default)
+        public static object OrDefault(this string str, object @default)
         {
             return string.IsNullOrEmpty(str) ? @default : str;
         }