Fixes #3941 - v2win/v2net: UICatalog crash - Fixes warnings

.gitignore

@@ -60,3 +60,11 @@ demo.*
 *.dotCover
 
 logs/
+
+BenchmarkDotNet.Artifacts/
+
+*.log
+
+*.log.*
+
+

Terminal.Gui/Application/Application.Initialization.cs

@@ -167,6 +167,8 @@ internal static void InternalInit (
         InitializedChanged?.Invoke (null, new (init));
     }
 
+    [RequiresUnreferencedCode ("AOT")]
+    [RequiresDynamicCode ("AOT")]
     internal static void InitializeConfigurationManagement ()
     {
         // Start the process of configuration management.

Terminal.Gui/Application/Application.cs

@@ -63,7 +63,7 @@ public static string ToString (IConsoleDriver? driver)
             {
                 Rune rune = contents [r, c].Rune;
 
-                if (rune.DecodeSurrogatePair (out char [] sp))
+                if (rune.DecodeSurrogatePair (out char []? sp))
                 {
                     sb.Append (sp);
                 }

Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -326,14 +326,17 @@ public static void PrintJsonErrors ()
     }
 
 
+    /// <summary>
+    ///     Logs Json deserialization errors that occurred during deserialization.
+    /// </summary>
     public static void LogJsonErrors ()
     {
         if (_jsonErrors.Length > 0)
         {
-            Logging.Warning (
+            Logging.Error (
                                @"Encountered the following errors while deserializing configuration files:"
                               );
-            Logging.Warning (_jsonErrors.ToString ());
+            Logging.Error (_jsonErrors.ToString ());
         }
     }
 

Terminal.Gui/Configuration/ScopeJsonConverter.cs

@@ -91,7 +91,7 @@ public override scopeT Read (ref Utf8JsonReader reader, Type typeToConvert, Json
                         scope! [propertyName].PropertyValue =
                             JsonSerializer.Deserialize (ref reader, propertyType!, SerializerContext);
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                        // Logging.Trace ($"scopeT Read: {ex}");
                     }

Terminal.Gui/ConsoleDrivers/AnsiResponseParser/Keyboard/CsiKeyPattern.cs

@@ -52,6 +52,11 @@ public CsiKeyPattern ()
         _pattern = new (@$"^\u001b\[(1;(\d+))?([{terms}]|\d+~)$");
     }
 
+    /// <summary>
+    ///     Called by the base class to determine the key that matches the input.
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
     protected override Key? GetKeyImpl (string input)
     {
         Match match = _pattern.Match (input);

Terminal.Gui/ConsoleDrivers/V2/MainLoop.cs

@@ -151,7 +151,7 @@ internal void IterationImpl ()
 
     private void SetCursor ()
     {
-        View? mostFocused = Application.Top.MostFocused;
+        View? mostFocused = Application.Top!.MostFocused;
 
         if (mostFocused == null)
         {

Terminal.Gui/ConsoleDrivers/V2/NetInputProcessor.cs

@@ -17,7 +17,7 @@ public class NetInputProcessor : InputProcessor<ConsoleKeyInfo>
     ///     </remarks>
     /// </summary>
     public static bool GenerateTestCasesForKeyPresses = false;
-#pragma warning enable CA2211
+#pragma warning restore CA2211
 
     /// <inheritdoc/>
     public NetInputProcessor (ConcurrentQueue<ConsoleKeyInfo> inputBuffer) : base (inputBuffer, new NetKeyConverter ()) { }

Terminal.Gui/Drawing/Region.cs

@@ -658,7 +658,7 @@ internal static List<Rectangle> MergeVerticalIntervals (SortedSet<(int yTop, int
             }
             else
             {
-                result.Add (new (startX, currentTop.Value, endX - startX, currentBottom.Value - currentTop.Value));
+                result.Add (new (startX, currentTop.Value, endX - startX, currentBottom!.Value - currentTop.Value));
                 currentTop = yTop;
                 currentBottom = yBottom;
             }

Terminal.Gui/Input/Keyboard/Key.cs

@@ -418,7 +418,7 @@ public override bool Equals (object? obj)
     /// <param name="a"></param>
     /// <param name="b"></param>
     /// <returns></returns>
-    public static bool operator != (Key a, Key? b) { return !a!.Equals (b); }
+    public static bool operator != (Key? a, Key? b) { return !a!.Equals (b); }
 
     /// <summary>Compares two <see cref="Key"/>s for less-than.</summary>
     /// <param name="a"></param>

Terminal.Gui/View/DrawContext.cs

@@ -2,7 +2,7 @@
 namespace Terminal.Gui;
 
 /// <summary>
-///     Tracks the region that has been drawn during <see cref="View.Draw"/>. This is primarily
+///     Tracks the region that has been drawn during <see cref="View.Draw(DrawContext?)"/>. This is primarily
 ///     in support of <see cref="ViewportSettings.Transparent"/>.
 /// </summary>
 public class DrawContext

Terminal.Gui/View/DrawEventArgs.cs

@@ -16,7 +16,7 @@ public class DrawEventArgs : CancelEventArgs
     ///     <see cref="View"/>.
     /// </param>
     /// <param name="drawContext">
-    ///     Add any regions that have been drawn to during <see cref="View.Draw"/> operations to this context. This is
+    ///     Add any regions that have been drawn to during <see cref="View.Draw(DrawContext?)"/> operations to this context. This is
     ///     primarily
     ///     in support of <see cref="ViewportSettings.Transparent"/>.
     /// </param>
@@ -34,7 +34,7 @@ public DrawEventArgs (Rectangle newViewport, Rectangle oldViewport, DrawContext?
     public Rectangle NewViewport { get; }
 
     /// <summary>
-    ///     Add any regions that have been drawn to during <see cref="View.Draw"/> operations to this context. This is
+    ///     Add any regions that have been drawn to during <see cref="View.Draw(DrawContext?)"/> operations to this context. This is
     ///     primarily
     ///     in support of <see cref="ViewportSettings.Transparent"/>.
     /// </summary>

Terminal.Gui/View/View.Content.cs

@@ -264,7 +264,7 @@ public ViewportSettings ViewportSettings
     ///     </para>
     ///     <para>
     ///         Altering the Viewport Size will eventually (when the view is next laid out) cause the
-    ///         <see cref="Layout()"/> and <see cref="OnDrawingContent"/> methods to be called.
+    ///         <see cref="Layout()"/> and <see cref="OnDrawingContent()"/> methods to be called.
     ///     </para>
     /// </remarks>
     public virtual Rectangle Viewport

Terminal.Gui/View/View.Drawing.cs

@@ -483,6 +483,7 @@ private void DoDrawContent (DrawContext? context = null)
             return;
         }
 
+        // TODO: Upgrade all overrides of OnDrawingContent to use DrawContext and remove this override
         if (OnDrawingContent ())
         {
             return;
@@ -504,7 +505,7 @@ private void DoDrawContent (DrawContext? context = null)
     /// </summary>
     /// <param name="context">The draw context to report drawn areas to.</param>
     /// <returns><see langword="true"/> to stop further drawing content.</returns>
-    protected virtual bool OnDrawingContent (DrawContext? context = null) { return false; }
+    protected virtual bool OnDrawingContent (DrawContext? context) { return false; }
 
     /// <summary>
     ///     Called when the View's content is to be drawn. The default implementation does nothing.

Terminal.Gui/View/View.Mouse.cs

@@ -762,6 +762,7 @@ internal bool SetPressedHighlight (HighlightStyle newHighlightStyle)
     ///     INTERNAL: Gets the Views that are under the mouse at <paramref name="location"/>, including Adornments.
     /// </summary>
     /// <param name="location"></param>
+    /// <param name="ignoreTransparent">If <see langword="true"/> any transparent views will be ignored.</param>
     /// <returns></returns>
     internal static List<View?> GetViewsUnderMouse (in Point location, bool ignoreTransparent = false)
     {

Terminal.Gui/Views/Bar.cs

@@ -109,11 +109,13 @@ public Orientation Orientation
         set => _orientationHelper.Orientation = value;
     }
 
+#pragma warning disable CS0067 // The event is never used
     /// <inheritdoc/>
     public event EventHandler<CancelEventArgs<Orientation>>? OrientationChanging;
 
     /// <inheritdoc/>
     public event EventHandler<EventArgs<Orientation>>? OrientationChanged;
+#pragma warning restore CS0067 // The event is never used
 
     /// <summary>Called when <see cref="Orientation"/> has changed.</summary>
     /// <param name="newOrientation"></param>

Terminal.Gui/Views/Line.cs

@@ -33,11 +33,13 @@ public Orientation Orientation
         set => _orientationHelper.Orientation = value;
     }
 
+#pragma warning disable CS0067 // The event is never used
     /// <inheritdoc/>
     public event EventHandler<CancelEventArgs<Orientation>> OrientationChanging;
 
     /// <inheritdoc/>
     public event EventHandler<EventArgs<Orientation>> OrientationChanged;
+#pragma warning restore CS0067 // The event is never used
 
     /// <summary>Called when <see cref="Orientation"/> has changed.</summary>
     /// <param name="newOrientation"></param>

Terminal.Gui/Views/RadioGroup.cs

@@ -403,12 +403,15 @@ public Orientation Orientation
 
     private readonly OrientationHelper _orientationHelper;
 
+#pragma warning disable CS0067 // The event is never used
     /// <inheritdoc/>
     public event EventHandler<CancelEventArgs<Orientation>>? OrientationChanging;
 
     /// <inheritdoc/>
     public event EventHandler<EventArgs<Orientation>>? OrientationChanged;
 
+#pragma warning restore CS0067
+
     /// <summary>Called when <see cref="Orientation"/> has changed.</summary>
     /// <param name="newOrientation"></param>
     public void OnOrientationChanged (Orientation newOrientation)

Terminal.Gui/Views/ScrollBar/ScrollBar.cs

@@ -164,8 +164,10 @@ public Orientation Orientation
         set => _orientationHelper.Orientation = value;
     }
 
+#pragma warning disable CS0067 // The event is never used
     /// <inheritdoc/>
     public event EventHandler<CancelEventArgs<Orientation>>? OrientationChanging;
+#pragma warning restore CS0067 // The event is never used
 
     /// <inheritdoc/>
     public event EventHandler<EventArgs<Orientation>>? OrientationChanged;

Terminal.Gui/Views/Wizard/WizardStep.cs

@@ -125,7 +125,7 @@ public override View Add (View? view)
     {
         _contentView.Add (view);
 
-        if (view.CanFocus)
+        if (view!.CanFocus)
         {
             CanFocus = true;
         }

UICatalog/Scenario.cs

@@ -149,7 +149,7 @@ public static ObservableCollection<Scenario> GetScenarios ()
     public virtual void Main () { }
 
     private const uint BENCHMARK_MAX_NATURAL_ITERATIONS = 500; // not including needed for demo keys
-    private const int BENCHMARK_KEY_PACING = 1; // Must be non-zero
+    private const int BENCHMARK_KEY_PACING = 10; // Must be non-zero
 
     public static uint BenchmarkTimeout { get; set; } = 2500;