dotnet package search tests use default width (#7171)

Author: zivkan

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchArgs.cs

@@ -13,6 +13,7 @@ internal class PackageSearchArgs
     {
         private const int DefaultSkip = 0;
         private const int DefaultTake = 20;
+        public int ConsoleWidth { get; set; }
         public List<string> Sources { get; set; }
         public int Skip { get; set; }
         public int Take { get; set; }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchCommand.cs

@@ -118,6 +118,7 @@ public static void Register(Command rootCommand, Func<ILoggerWithColor> getLogge
                         Interactive = parserResult.GetValue(interactive),
                         Prerelease = parserResult.GetValue(prerelease),
                         Logger = logger,
+                        ConsoleWidth = GetConsoleWidth(),
                     };
 
                     return await setupSettingsAndRunSearchAsync(packageSearchArgs, parserResult.GetValue(configFile), cancelationToken);
@@ -132,6 +133,24 @@ public static void Register(Command rootCommand, Func<ILoggerWithColor> getLogge
             rootCommand.Subcommands.Add(searchCommand);
         }
 
+        internal static int GetConsoleWidth()
+        {
+            try
+            {
+                int width = Console.WindowWidth;
+                if (width > 0)
+                {
+                    return width;
+                }
+            }
+            catch (IOException)
+            {
+                // Console.WindowWidth throws IOException when no console is attached
+            }
+
+            return Table.DefaultWindowWidth;
+        }
+
         public static async Task<int> SetupSettingsAndRunSearchAsync(PackageSearchArgs packageSearchArgs, string configFile, CancellationToken cancellationToken)
         {
             DefaultCredentialServiceUtility.SetupDefaultCredentialService(packageSearchArgs.Logger, !packageSearchArgs.Interactive);

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchResultTableRenderer.cs

@@ -20,13 +20,15 @@ internal class PackageSearchResultTableRenderer : IPackageSearchResultRenderer
         private static readonly string SourceSeparator = new('*', LineSeparatorLength);
         private PackageSearchVerbosity _verbosity;
         private bool _exactMatch;
+        private int _consoleWidth;
 
-        public PackageSearchResultTableRenderer(string searchTerm, ILoggerWithColor loggerWithColor, PackageSearchVerbosity verbosity, bool exactMatch)
+        public PackageSearchResultTableRenderer(string searchTerm, ILoggerWithColor loggerWithColor, PackageSearchVerbosity verbosity, bool exactMatch, int consoleWidth)
         {
             _searchTerm = searchTerm;
             _loggerWithColor = loggerWithColor;
             _verbosity = verbosity;
             _exactMatch = exactMatch;
+            _consoleWidth = consoleWidth;
         }
 
         public void Add(PackageSource source, IEnumerable<IPackageSearchMetadata> completedSearch)
@@ -35,7 +37,7 @@ public void Add(PackageSource source, IEnumerable<IPackageSearchMetadata> comple
             _loggerWithColor.LogMinimal($"Source: {source.Name} ({source.SourceUri})");
 
             ITableFormatStrategy strategy = TableFormatStrategyFactory.GetStrategy(_verbosity, _exactMatch);
-            Table table = strategy.CreateTable();
+            Table table = strategy.CreateTable(_consoleWidth);
             PopulateTableWithResultsAsync(completedSearch, table, _verbosity);
             table.PrintResult(_searchTerm, _loggerWithColor);
         }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/PackageSearchRunner.cs

@@ -40,7 +40,7 @@ public static async Task<int> RunAsync(
             }
             else
             {
-                packageSearchResultRenderer = new PackageSearchResultTableRenderer(packageSearchArgs.SearchTerm, packageSearchArgs.Logger, packageSearchArgs.Verbosity, packageSearchArgs.ExactMatch);
+                packageSearchResultRenderer = new PackageSearchResultTableRenderer(packageSearchArgs.SearchTerm, packageSearchArgs.Logger, packageSearchArgs.Verbosity, packageSearchArgs.ExactMatch, packageSearchArgs.ConsoleWidth);
             }
 
             packageSearchResultRenderer.Start();

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/Table.cs

@@ -20,7 +20,7 @@ internal class Column
     internal class Table
     {
         // This is the default window width if we cannot get the actual window width
-        const int DefaultWindowWidth = 115;
+        internal const int DefaultWindowWidth = 115;
         // This is the minimum number of characters in a column which includes "| c |" where c is a character
         const int MinimumCharactersInAColumn = 4;
         // This is the list of columns in the table
@@ -36,30 +36,16 @@ internal class Table
         // This is the default console color
         private readonly ConsoleColor _consoleColor = Console.ForegroundColor;
 
-        public Table(int[] columnsToHighlight, params string[] headers)
+        public Table(int[] columnsToHighlight, string[] headers, int consoleWidth)
         {
-            _columnsToHighlight = columnsToHighlight;
-            int windowWidth = -1;
-
-            // Get the window width if possible 
-            try
+            if (consoleWidth <= 0)
             {
-                windowWidth = Console.WindowWidth;
-            }
-            catch (Exception)
-            {
-                // Ignore any exception
+                throw new ArgumentOutOfRangeException(nameof(consoleWidth), consoleWidth, "Console width must be greater than zero.");
             }
 
-            // If the window width is not available, use the default window width
-            if (windowWidth <= 0)
-            {
-                _maxColumnWidth = DefaultWindowWidth;
-            }
-            else
-            {
-                _maxColumnWidth = Math.Max(MinimumCharactersInAColumn, (windowWidth - MinimumCharactersInAColumn * headers.Length) / headers.Length);
-            }
+            _columnsToHighlight = columnsToHighlight;
+
+            _maxColumnWidth = Math.Max(MinimumCharactersInAColumn, (consoleWidth - MinimumCharactersInAColumn * headers.Length) / headers.Length);
 
             // Add the headers
             foreach (var header in headers)

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/TableFormat/DetailedTableFormatStrategy.cs

@@ -10,9 +10,9 @@ internal class DetailedTableFormatStrategy : ITableFormatStrategy
         private readonly string[] _detailedVerbosityTableHeader = { "Package ID", "Latest Version", "Owners", "Total Downloads", "Vulnerable", "Deprecation", "Project URL", "Description" };
         private readonly int[] _detailedColumnsToHighlight = { 0, 2, 6, 7 };
 
-        public Table CreateTable()
+        public Table CreateTable(int consoleWidth)
         {
-            return new Table(_detailedColumnsToHighlight, _detailedVerbosityTableHeader);
+            return new Table(_detailedColumnsToHighlight, _detailedVerbosityTableHeader, consoleWidth);
         }
     }
 }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/TableFormat/ExactDetailedTableFormatStrategy.cs

@@ -10,9 +10,9 @@ internal class ExactDetailedTableFormatStrategy : ITableFormatStrategy
         private readonly string[] _detailedVerbosityTableHeaderForExactMatch = { "Package ID", "Version", "Owners", "Total Downloads", "Vulnerable", "Deprecation", "Project URL", "Description" };
         private readonly int[] _detailedColumnsToHighlight = { 0, 2, 6, 7 };
 
-        public Table CreateTable()
+        public Table CreateTable(int consoleWidth)
         {
-            return new Table(_detailedColumnsToHighlight, _detailedVerbosityTableHeaderForExactMatch);
+            return new Table(_detailedColumnsToHighlight, _detailedVerbosityTableHeaderForExactMatch, consoleWidth);
         }
     }
 }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/TableFormat/ExactMinimalTableFormatStrategy.cs

@@ -10,9 +10,9 @@ internal class ExactMinimalTableFormatStrategy : ITableFormatStrategy
         private readonly string[] _minimalVerbosityTableHeaderForExactMatch = { "Package ID", "Version" };
         private readonly int[] _minimalColumnsToHighlight = { 0 };
 
-        public Table CreateTable()
+        public Table CreateTable(int consoleWidth)
         {
-            return new Table(_minimalColumnsToHighlight, _minimalVerbosityTableHeaderForExactMatch);
+            return new Table(_minimalColumnsToHighlight, _minimalVerbosityTableHeaderForExactMatch, consoleWidth);
         }
     }
 }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/TableFormat/ExactNormalTableFormatStrategy.cs

@@ -10,9 +10,9 @@ internal class ExactNormalTableFormatStrategy : ITableFormatStrategy
         private readonly string[] _normalVerbosityTableHeaderForExactMatch = { "Package ID", "Version", "Owners", "Total Downloads" };
         private readonly int[] _normalColumnsToHighlight = { 0, 2 };
 
-        public Table CreateTable()
+        public Table CreateTable(int consoleWidth)
         {
-            return new Table(_normalColumnsToHighlight, _normalVerbosityTableHeaderForExactMatch);
+            return new Table(_normalColumnsToHighlight, _normalVerbosityTableHeaderForExactMatch, consoleWidth);
         }
     }
 }

src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PackageSearch/TableFormat/ITableFormatStrategy.cs

@@ -7,6 +7,6 @@ namespace NuGet.CommandLine.XPlat
 {
     internal interface ITableFormatStrategy
     {
-        Table CreateTable();
+        Table CreateTable(int consoleWidth);
     }
 }