Added back braces for namespace, dropping braces makes PR hard to read.

Author: emreaydinceren

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -12,69 +12,71 @@
 
 using Terminal.Gui;
 
-namespace Microsoft.PowerShell.ConsoleGuiTools;
-
-internal sealed class GridViewDataSource(IEnumerable<GridViewRow> gridViewRowList) : IListDataSource
+namespace Microsoft.PowerShell.ConsoleGuiTools
 {
-    internal List<GridViewRow> GridViewRowList { get; init; } = gridViewRowList.ToList();
-
-    public int Count => GridViewRowList.Count;
-
-    public int Length { get; }
 
-    public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width, int start)
+    internal sealed class GridViewDataSource(IEnumerable<GridViewRow> gridViewRowList) : IListDataSource
     {
-        container.Move(col, line);
-        RenderUstr(driver, GridViewRowList[item].DisplayString, width);
-    }
+        internal List<GridViewRow> GridViewRowList { get; init; } = gridViewRowList.ToList();
 
-    public bool IsMarked(int item) => GridViewRowList[item].IsMarked;
+        public int Count => GridViewRowList.Count;
 
-    public void SetMark(int item, bool value)
-    {
-        var oldValue = GridViewRowList[item].IsMarked;
-        GridViewRowList[item].IsMarked = value;
-        var args = new RowMarkedEventArgs()
+        public int Length { get; }
+
+        public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width, int start)
         {
-            Row = GridViewRowList[item],
-            OldValue = oldValue
-        };
-        MarkChanged?.Invoke(this, args);
-    }
+            container.Move(col, line);
+            RenderUstr(driver, GridViewRowList[item].DisplayString, width);
+        }
 
-    public sealed class RowMarkedEventArgs : EventArgs
-    {
-        public GridViewRow Row { get; set; }
-        public bool OldValue { get; set; }
+        public bool IsMarked(int item) => GridViewRowList[item].IsMarked;
 
-    }
+        public void SetMark(int item, bool value)
+        {
+            var oldValue = GridViewRowList[item].IsMarked;
+            GridViewRowList[item].IsMarked = value;
+            var args = new RowMarkedEventArgs()
+            {
+                Row = GridViewRowList[item],
+                OldValue = oldValue
+            };
+            MarkChanged?.Invoke(this, args);
+        }
 
-    public event EventHandler<RowMarkedEventArgs> MarkChanged;
+        public sealed class RowMarkedEventArgs : EventArgs
+        {
+            public GridViewRow Row { get; set; }
+            public bool OldValue { get; set; }
 
-    public IList ToList()
-    {
-        return GridViewRowList;
-    }
+        }
 
-    // A slightly adapted method from gui.cs: https://github.com/migueldeicaza/gui.cs/blob/fc1faba7452ccbdf49028ac49f0c9f0f42bbae91/Terminal.Gui/Views/ListView.cs#L433-L461
-    private static void RenderUstr(ConsoleDriver driver, ustring ustr, int width)
-    {
-        int used = 0;
-        int index = 0;
-        while (index < ustr.Length)
+        public event EventHandler<RowMarkedEventArgs> MarkChanged;
+
+        public IList ToList()
         {
-            (var rune, var size) = Utf8.DecodeRune(ustr, index, index - ustr.Length);
-            var count = Rune.ColumnWidth(rune);
-            if (used + count > width) break;
-            driver.AddRune(rune);
-            used += count;
-            index += size;
+            return GridViewRowList;
         }
 
-        while (used < width)
+        // A slightly adapted method from gui.cs: https://github.com/migueldeicaza/gui.cs/blob/fc1faba7452ccbdf49028ac49f0c9f0f42bbae91/Terminal.Gui/Views/ListView.cs#L433-L461
+        private static void RenderUstr(ConsoleDriver driver, ustring ustr, int width)
         {
-            driver.AddRune(' ');
-            used++;
+            int used = 0;
+            int index = 0;
+            while (index < ustr.Length)
+            {
+                (var rune, var size) = Utf8.DecodeRune(ustr, index, index - ustr.Length);
+                var count = Rune.ColumnWidth(rune);
+                if (used + count > width) break;
+                driver.AddRune(rune);
+                used += count;
+                index += size;
+            }
+
+            while (used < width)
+            {
+                driver.AddRune(' ');
+                used++;
+            }
         }
     }
 }

src/Microsoft.PowerShell.ConsoleGuiTools/GridViewDataSource.cs

@@ -8,53 +8,55 @@
 
 using Microsoft.PowerShell.ConsoleGuiTools.Models;
 
-namespace Microsoft.PowerShell.ConsoleGuiTools;
-
-internal static class GridViewHelpers
+namespace Microsoft.PowerShell.ConsoleGuiTools
 {
-    // Add all items already selected plus any that match the filter
-    // The selected items should be at the top of the list, in their original order
-    internal static List<GridViewRow> FilterData(List<GridViewRow> listToFilter, string filter)
+
+    internal static class GridViewHelpers
     {
-        var filteredList = new List<GridViewRow>();
-        if (string.IsNullOrEmpty(filter))
+        // Add all items already selected plus any that match the filter
+        // The selected items should be at the top of the list, in their original order
+        internal static List<GridViewRow> FilterData(List<GridViewRow> listToFilter, string filter)
         {
-            return listToFilter;
-        }
+            var filteredList = new List<GridViewRow>();
+            if (string.IsNullOrEmpty(filter))
+            {
+                return listToFilter;
+            }
 
-        filteredList.AddRange(listToFilter.Where(gvr => gvr.IsMarked));
-        filteredList.AddRange(listToFilter.Where(gvr => !gvr.IsMarked && Regex.IsMatch(gvr.DisplayString, filter, RegexOptions.IgnoreCase)));
+            filteredList.AddRange(listToFilter.Where(gvr => gvr.IsMarked));
+            filteredList.AddRange(listToFilter.Where(gvr => !gvr.IsMarked && Regex.IsMatch(gvr.DisplayString, filter, RegexOptions.IgnoreCase)));
 
-        return filteredList;
-    }
-
-    /// <summary>
-    /// Creates the header and data source for the GridView.
-    /// </summary>
-    /// <param name="listViewOffset"> Dictates where the header should actually start considering
-    /// some offset is needed to factor in the checkboxes
-    /// </param>
-    /// <param name="applicationData"></param>
-    /// <param name="leftMargin">Dictates where the header should actually start considering some offset is needed to factor in the checkboxes</param>
-    /// <returns><see cref="GridViewHeader"/> and <see cref="GridViewDataSource"/> from commandlet inputs.</returns>
-    internal static (GridViewHeader Header, GridViewDataSource DataSource) CreateGridViewInputs(int listViewOffset, int leftMargin, ApplicationData applicationData, object[] properties)
-    {
-        var table = FormatHelper.FormatTable(applicationData.Input, applicationData.Force, properties);
-
-        var gridViewHeader = new GridViewHeader
-        {
-            HeaderText = string.Concat(new string(' ', listViewOffset), table.Header),
-            HeaderUnderLine = string.Concat(new string(' ', listViewOffset), table.HeaderLine)
-        };
+            return filteredList;
+        }
 
-        var gridViewDataSource = new GridViewDataSource(table.Rows.Select((line, index) => new GridViewRow
+        /// <summary>
+        /// Creates the header and data source for the GridView.
+        /// </summary>
+        /// <param name="listViewOffset"> Dictates where the header should actually start considering
+        /// some offset is needed to factor in the checkboxes
+        /// </param>
+        /// <param name="applicationData"></param>
+        /// <param name="leftMargin">Dictates where the header should actually start considering some offset is needed to factor in the checkboxes</param>
+        /// <returns><see cref="GridViewHeader"/> and <see cref="GridViewDataSource"/> from commandlet inputs.</returns>
+        internal static (GridViewHeader Header, GridViewDataSource DataSource) CreateGridViewInputs(int listViewOffset, int leftMargin, ApplicationData applicationData, object[] properties)
         {
-            DisplayString = line,
-            OriginalIndex = index
-        }));
-
-        return (
-            gridViewHeader, 
-            gridViewDataSource);
+            var table = FormatHelper.FormatTable(applicationData.Input, applicationData.Force, properties);
+
+            var gridViewHeader = new GridViewHeader
+            {
+                HeaderText = string.Concat(new string(' ', listViewOffset), table.Header),
+                HeaderUnderLine = string.Concat(new string(' ', listViewOffset), table.HeaderLine)
+            };
+
+            var gridViewDataSource = new GridViewDataSource(table.Rows.Select((line, index) => new GridViewRow
+            {
+                DisplayString = line,
+                OriginalIndex = index
+            }));
+
+            return (
+                gridViewHeader,
+                gridViewDataSource);
+        }
     }
 }

src/Microsoft.PowerShell.ConsoleGuiTools/GridViewHelpers.cs

@@ -1,38 +1,40 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.PowerShell.ConsoleGuiTools.Models;
+namespace Microsoft.PowerShell.ConsoleGuiTools.Models
+{
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Management.Automation;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Management.Automation;
 
-internal class ApplicationData
-{
-    public string Title { get; set; }
-    public OutputModeOption OutputMode { get; set; }
-    public bool PassThru { get; set; }
-    public string Filter { get; set; }
-    public bool MinUI { get; set; }
-   
-    public bool UseNetDriver { get; set; }
-    public bool Verbose { get; set; }
-    public bool Debug { get; set; }
-
-    public string ModuleVersion { get; set; }
-
-    /// <summary>
-    /// Get's the objects from the pipeline.
-    /// </summary>
-    public IReadOnlyList<PSObject> Input { get; init; }
-
-    /// <summary>
-    /// Gets the Properties parameter.
-    /// </summary>
-    public object[] Properties { get; init; }
-
-    /// <summary>
-    /// Gets the Force parameter.
-    /// </summary>
-    public bool Force { get; init; }
+    internal class ApplicationData
+    {
+        public string Title { get; set; }
+        public OutputModeOption OutputMode { get; set; }
+        public bool PassThru { get; set; }
+        public string Filter { get; set; }
+        public bool MinUI { get; set; }
+
+        public bool UseNetDriver { get; set; }
+        public bool Verbose { get; set; }
+        public bool Debug { get; set; }
+
+        public string ModuleVersion { get; set; }
+
+        /// <summary>
+        /// Get's the objects from the pipeline.
+        /// </summary>
+        public IReadOnlyList<PSObject> Input { get; init; }
+
+        /// <summary>
+        /// Gets the Properties parameter.
+        /// </summary>
+        public object[] Properties { get; init; }
+
+        /// <summary>
+        /// Gets the Force parameter.
+        /// </summary>
+        public bool Force { get; init; }
+    }
 }

src/Microsoft.PowerShell.ConsoleGuiTools/Models/ApplicationData.cs

@@ -1,22 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Microsoft.PowerShell.ConsoleGuiTools.Models;
-
-public enum OutputModeOption
+namespace Microsoft.PowerShell.ConsoleGuiTools.Models
 {
-    /// <summary>
-    /// None is the default and it means OK and Cancel will not be present
-    /// and no objects will be written to the pipeline.
-    /// The selectionMode of the actual list will still be multiple.
-    /// </summary>
-    None,
-    /// <summary>
-    /// Allow selection of one single item to be written to the pipeline.
-    /// </summary>
-    Single,
-    /// <summary>
-    ///Allow select of multiple items to be written to the pipeline.
-    /// </summary>
-    Multiple
+    public enum OutputModeOption
+    {
+        /// <summary>
+        /// None is the default and it means OK and Cancel will not be present
+        /// and no objects will be written to the pipeline.
+        /// The selectionMode of the actual list will still be multiple.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Allow selection of one single item to be written to the pipeline.
+        /// </summary>
+        Single,
+        /// <summary>
+        ///Allow select of multiple items to be written to the pipeline.
+        /// </summary>
+        Multiple
+    }
 }

src/Microsoft.PowerShell.ConsoleGuiTools/Models/OutputModeOptions.cs

@@ -6,36 +6,38 @@
 using System.Text;
 //TODO: switch to JSON.NET
 
-namespace Microsoft.PowerShell.ConsoleGuiTools.Models;
-
-public class Serializers
+namespace Microsoft.PowerShell.ConsoleGuiTools.Models
 {
-    private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings()
-    {
-        TypeNameHandling = TypeNameHandling.All
-    };
-
-    public static string ObjectToJson<T>(T obj)
-    {
-        var jsonString = JsonConvert.SerializeObject(obj, jsonSerializerSettings);
-
-        return ToBase64String(jsonString);
-    }
-
-    public static T ObjectFromJson<T>(string base64Json)
-    {
-        var jsonString = FromBase64String(base64Json);
-
-        return JsonConvert.DeserializeObject<T>(jsonString, jsonSerializerSettings);
-    }
-
-    private static string FromBase64String(string base64string)
-    {
-        return Encoding.UTF8.GetString(Convert.FromBase64String(base64string));
-    }
 
-    private static string ToBase64String(string str)
+    public class Serializers
     {
-        return Convert.ToBase64String(Encoding.UTF8.GetBytes(str));
+        private readonly static JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings()
+        {
+            TypeNameHandling = TypeNameHandling.All
+        };
+
+        public static string ObjectToJson<T>(T obj)
+        {
+            var jsonString = JsonConvert.SerializeObject(obj, jsonSerializerSettings);
+
+            return ToBase64String(jsonString);
+        }
+
+        public static T ObjectFromJson<T>(string base64Json)
+        {
+            var jsonString = FromBase64String(base64Json);
+
+            return JsonConvert.DeserializeObject<T>(jsonString, jsonSerializerSettings);
+        }
+
+        private static string FromBase64String(string base64string)
+        {
+            return Encoding.UTF8.GetString(Convert.FromBase64String(base64string));
+        }
+
+        private static string ToBase64String(string str)
+        {
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes(str));
+        }
     }
 }