Merge pull request #790 from ariasuni/fix-too-many-headers-in-grid-details

Don’t produce extra column sometimes with long grid + header

src/output/grid_details.rs

@@ -157,7 +157,11 @@ impl<'a> Render<'a> {
                              .map(|file| self.file_style.for_file(file, self.theme).paint().promote())
                              .collect::<Vec<_>>();
 
-        let mut last_working_table = self.make_grid(1, options, &file_names, rows.clone(), &drender);
+        let mut last_working_grid = self.make_grid(1, options, &file_names, rows.clone(), &drender);
+        
+        if file_names.len() == 1 {
+            return Some((last_working_grid, 1));
+        }
 
         // If we can’t fit everything in a grid 100 columns wide, then
         // something has gone seriously awry
@@ -166,23 +170,26 @@ impl<'a> Render<'a> {
 
             let the_grid_fits = {
                 let d = grid.fit_into_columns(column_count);
-                d.is_complete() && d.width() <= self.console_width
+                d.width() <= self.console_width
             };
 
             if the_grid_fits {
-                last_working_table = grid;
+                if column_count == file_names.len() {
+                    return Some((grid, column_count));
+                } else { 
+                    last_working_grid = grid;
                 }
-            else {
+            } else {
                 // If we’ve figured out how many columns can fit in the user’s
                 // terminal, and it turns out there aren’t enough rows to
                 // make it worthwhile, then just resort to the lines view.
                 if let RowThreshold::MinimumRows(thresh) = self.row_threshold {
-                    if last_working_table.fit_into_columns(column_count - 1).row_count() < thresh {
+                    if last_working_grid.fit_into_columns(column_count - 1).row_count() < thresh {
                         return None;
                     }
                 }
 
-                return Some((last_working_table, column_count - 1));
+                return Some((last_working_grid, column_count - 1));
             }
         }
 

xtests/grid-details-view.toml

@@ -76,3 +76,24 @@ stdout = { file = "outputs/files_paths_long_grid_3col.ansitxt" }
 stderr = { empty = true }
 status = 0
 tags = [ 'env', 'long', 'grid' ]
+
+
+# check if exa is using the minimum number of columns with headers
+
+[[cmd]]
+name = "‘COLUMN=200 exa -lGh’ with one file don’t produce extra columns even if there place for more"
+shell = "exa -lGh /testcases/files/10_bytes"
+environment = { COLUMNS = "200" }
+stdout = { file = "outputs/files_paths_long_grid_header_1file.ansitxt" }
+stderr = { empty = true }
+status = 0
+tags = [ 'env', 'long', 'grid' ]
+
+[[cmd]]
+name = "‘COLUMN=200 exa -lGh’ with several files don’t produce extra columns even if there place for more"
+shell = "exa -lGh /testcases/files/10_{bytes,KiB}"
+environment = { COLUMNS = "200" }
+stdout = { file = "outputs/files_paths_long_grid_header_2files.ansitxt" }
+stderr = { empty = true }
+status = 0
+tags = [ 'env', 'long', 'grid' ]

xtests/outputs/files_paths_long_grid_header_1file.ansitxt

@@ -0,0 +1,2 @@
+Permissions Size User      Date Modified Name
+.rw-r--r--    10 cassowary  1 Jan 12:34  /testcases/files/10_bytes

xtests/outputs/files_paths_long_grid_header_2files.ansitxt

@@ -0,0 +1,2 @@
+Permissions Size User      Date Modified Name                         Permissions Size User      Date Modified Name
+.rw-r--r--    10 cassowary  1 Jan 12:34  /testcases/files/10_bytes    .rw-r--r--   10k cassowary  1 Jan 12:34  /testcases/files/10_KiB