V2 fix warnings (gui-cs#3671)

* Fixed NumericUpDown warning * Fixed Aot Warning * Fixed warnings in Application.cs * Fixed more NumericUpDown warning * Fixed CommandImpl warning * Fixed Thickness warnings * Fixed Label warning * Fixed warning * Fixed menubar test warning * Fixed warnings * Fixed warnings * Removed dead code * Fixed warnings
dodexahedron · Aug 19, 2024 · b267e16 · b267e16
1 parent a0c03b1
commit b267e16
Show file tree

Hide file tree

Showing 17 changed files with 5,783 additions and 5,809 deletions.
diff --git a/NativeAot/Program.cs b/NativeAot/Program.cs
@@ -17,14 +17,14 @@ private static void Main (string [] args)
 
         #region The code in this region is not intended for use in a native Aot self-contained. It's just here to make sure there is no functionality break with localization in Terminal.Gui using self-contained
 
-        if (Equals(Thread.CurrentThread.CurrentUICulture, CultureInfo.InvariantCulture) && Application.SupportedCultures.Count == 0)
+        if (Equals(Thread.CurrentThread.CurrentUICulture, CultureInfo.InvariantCulture) && Application.SupportedCultures!.Count == 0)
         {
             // Only happens if the project has <InvariantGlobalization>true</InvariantGlobalization>
             Debug.Assert (Application.SupportedCultures.Count == 0);
         }
         else
         {
-            Debug.Assert (Application.SupportedCultures.Count > 0);
+            Debug.Assert (Application.SupportedCultures!.Count > 0);
             Debug.Assert (Equals (CultureInfo.CurrentCulture, Thread.CurrentThread.CurrentUICulture));
         }
 

diff --git a/Terminal.Gui/Application/Application.Keyboard.cs b/Terminal.Gui/Application/Application.Keyboard.cs
@@ -190,7 +190,7 @@ public static bool OnKeyDown (Key keyEvent)
 
                 foreach (Command command in appBinding.Commands)
                 {
-                    if (!CommandImplementations.ContainsKey (command))
+                    if (!CommandImplementations!.ContainsKey (command))
                     {
                         throw new NotSupportedException (
                                                          @$"A KeyBinding was set up for the command {command} ({keyEvent}) but that command is not supported by Application."
@@ -274,7 +274,7 @@ public static bool OnKeyUp (Key a)
     /// <summary>
     ///     Commands for Application.
     /// </summary>
-    private static Dictionary<Command, Func<CommandContext, bool?>> CommandImplementations { get; set; }
+    private static Dictionary<Command, Func<CommandContext, bool?>>? CommandImplementations { get; set; }
 
     /// <summary>
     ///     <para>
@@ -292,7 +292,7 @@ public static bool OnKeyUp (Key a)
     /// </remarks>
     /// <param name="command">The command.</param>
     /// <param name="f">The function.</param>
-    private static void AddCommand (Command command, Func<bool?> f) { CommandImplementations [command] = ctx => f (); }
+    private static void AddCommand (Command command, Func<bool?> f) { CommandImplementations! [command] = ctx => f (); }
 
     static Application () { AddApplicationKeyBindings (); }
 
@@ -432,31 +432,4 @@ internal static List<KeyBinding> GetViewKeyBindings ()
                           .Distinct ()
                           .ToList ();
     }
-
-    ///// <summary>
-    /////     Gets the list of Views that have <see cref="KeyBindingScope.Application"/> key bindings for the specified key.
-    ///// </summary>
-    ///// <remarks>
-    /////     This is an internal method used by the <see cref="View"/> class to add Application key bindings.
-    ///// </remarks>
-    ///// <param name="key">The key to check.</param>
-    ///// <param name="views">Outputs the list of views bound to <paramref name="key"/></param>
-    ///// <returns><see langword="True"/> if successful.</returns>
-    //internal static bool TryGetKeyBindings (Key key, out List<View> views) { return _keyBindings.TryGetValue (key, out views); }
-
-    /// <summary>
-    ///     Removes all <see cref="KeyBindingScope.Application"/> scoped key bindings for the specified view.
-    /// </summary>
-    /// <remarks>
-    ///     This is an internal method used by the <see cref="View"/> class to remove Application key bindings.
-    /// </remarks>
-    /// <param name="view">The view that is bound to the key.</param>
-    internal static void RemoveKeyBindings (View view)
-    {
-        List<KeyBinding> list = KeyBindings.Bindings
-                                           .Where (kv => kv.Value.Scope != KeyBindingScope.Application)
-                                           .Select (kv => kv.Value)
-                                           .Distinct ()
-                                           .ToList ();
-    }
 }
diff --git a/Terminal.Gui/Application/Application.cs b/Terminal.Gui/Application/Application.cs
@@ -32,7 +32,7 @@ public static partial class Application
     /// <returns>A string representation of the Application </returns>
     public new static string ToString ()
     {
-        ConsoleDriver driver = Driver;
+        ConsoleDriver? driver = Driver;
 
         if (driver is null)
         {
@@ -47,13 +47,17 @@ public static partial class Application
     /// </summary>
     /// <param name="driver">The driver to use to render the contents.</param>
     /// <returns>A string representation of the Application </returns>
-    public static string ToString (ConsoleDriver driver)
+    public static string ToString (ConsoleDriver? driver)
     {
+        if (driver is null)
+        {
+            return string.Empty;
+        }
         var sb = new StringBuilder ();
 
-        Cell [,] contents = driver.Contents;
+        Cell [,] contents = driver?.Contents!;
 
-        for (var r = 0; r < driver.Rows; r++)
+        for (var r = 0; r < driver!.Rows; r++)
         {
             for (var c = 0; c < driver.Cols; c++)
             {

diff --git a/Terminal.Gui/Drawing/Thickness.cs b/Terminal.Gui/Drawing/Thickness.cs
@@ -61,7 +61,7 @@ public Thickness (int left, int top, int right, int bottom)
     [JsonInclude]
     public int Bottom
     {
-        get => (int)_sides.W;
+        readonly get => (int)_sides.W;
         set => _sides.W = value;
     }
 
@@ -249,7 +249,7 @@ public int Horizontal
     [JsonInclude]
     public int Left
     {
-        get => (int)_sides.X;
+        readonly get => (int)_sides.X;
         set => _sides.X = value;
     }
 
@@ -265,15 +265,15 @@ public int Left
     [JsonInclude]
     public int Right
     {
-        get => (int)_sides.Z;
+        readonly get => (int)_sides.Z;
         set => _sides.Z = value;
     }
 
     /// <summary>Gets or sets the width of the upper side of the rectangle.</summary>
     [JsonInclude]
     public int Top
     {
-        get => (int)_sides.Y;
+        readonly get => (int)_sides.Y;
         set => _sides.Y = value;
     }
 

diff --git a/Terminal.Gui/View/View.Keyboard.cs b/Terminal.Gui/View/View.Keyboard.cs
@@ -27,7 +27,6 @@ private void SetupKeyboard ()
     private void DisposeKeyboard ()
     {
         TitleTextFormatter.HotKeyChanged -= TitleTextFormatter_HotKeyChanged;
-        Application.RemoveKeyBindings (this);
     }
 
     #region HotKey Support

diff --git a/Terminal.Gui/Views/Label.cs b/Terminal.Gui/Views/Label.cs
@@ -51,9 +51,9 @@ public override Rune HotKeySpecifier
         set => TextFormatter.HotKeySpecifier = base.HotKeySpecifier = value;
     }
 
-    private new bool? FocusNext ()
+    private bool? FocusNext ()
     {
-        var me = SuperView?.Subviews.IndexOf (this) ?? -1;
+        int me = SuperView?.Subviews.IndexOf (this) ?? -1;
         if (me != -1 && me < SuperView?.Subviews.Count - 1)
         {
             SuperView?.Subviews [me + 1].SetFocus ();

diff --git a/Terminal.Gui/Views/NumericUpDown.cs b/Terminal.Gui/Views/NumericUpDown.cs
@@ -100,7 +100,7 @@ public NumericUpDown ()
                             return false;
                         }
 
-                        if (Value is { })
+                        if (Value is { } && Increment is { })
                         {
                             Value = (dynamic)Value + (dynamic)Increment;
                         }
@@ -117,11 +117,12 @@ public NumericUpDown ()
                             return false;
                         }
 
-                        if (Value is { })
+                        if (Value is { } && Increment is { })
                         {
                             Value = (dynamic)Value - (dynamic)Increment;
                         }
 
+
                         return true;
                     });
 
@@ -218,23 +219,23 @@ private void SetText ()
         Text = _number.Text;
     }
 
-    private T _increment;
+    private T? _increment;
 
     /// <summary>
     /// </summary>
-    public T Increment
+    public T? Increment
     {
         get => _increment;
         set
         {
-            if ((dynamic)_increment == (dynamic)value)
+            if (_increment is { } && value is { } && (dynamic)_increment == (dynamic)value)
             {
                 return;
             }
 
             _increment = value;
 
-            IncrementChanged?.Invoke (this, new (value));
+            IncrementChanged?.Invoke (this, new (value!));
         }
     }
 

diff --git a/UICatalog/Scenarios/ListViewWithSelection.cs b/UICatalog/Scenarios/ListViewWithSelection.cs
@@ -202,9 +202,11 @@ public bool IsMarked (int item)
 
             return false;
         }
-
+#pragma warning disable CS0067
         /// <inheritdoc />
         public event NotifyCollectionChangedEventHandler CollectionChanged;
+#pragma warning restore CS0067
+
         public int Count => Scenarios?.Count ?? 0;
         public int Length { get; private set; }
         public bool SuspendCollectionChangedEvent { get => throw new System.NotImplementedException (); set => throw new System.NotImplementedException (); }

diff --git a/UICatalog/UICatalog.cs b/UICatalog/UICatalog.cs
@@ -643,7 +643,7 @@ public UICatalogTopLevel ()
             Add (CategoryList);
             Add (ScenarioList);
 
-            Add (MenuBar);
+            Add (MenuBar!);
 
             if (StatusBar is { })
             {

diff --git a/UnitTests/Configuration/ConfigurationMangerTests.cs b/UnitTests/Configuration/ConfigurationMangerTests.cs
@@ -389,6 +389,7 @@ public void TestConfigProperties ()
                                             )
                    );
 
+#pragma warning disable xUnit2029
         Assert.Empty (
                       Settings.Where (
                                       cp => cp.Value.PropertyInfo!.GetCustomAttribute (
@@ -397,6 +398,7 @@ public void TestConfigProperties ()
                                             == null
                                      )
                      );
+#pragma warning restore xUnit2029
 
         // Application is a static class
         PropertyInfo pi = typeof (Application).GetProperty ("QuitKey");