Avoid widening table columns that already fit

Bigquin · Nov 20, 2019 · 2022f8e · 2022f8e
1 parent 9fc80a1
commit 2022f8e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/utils/table_printer.go b/utils/table_printer.go
@@ -50,10 +50,19 @@ func (t *TTYTablePrinter) FitColumns() {
 	numCols := len(t.colWidths)
 	delimWidth := 2
 	availWidth := t.maxWidth - t.colWidths[0] - ((numCols - 1) * delimWidth)
-	// TODO: avoid widening columns that already fit
+	// add extra space from columns that are already narrower than threshold
+	for col := 1; col < len(t.colWidths); col++ {
+		availColWidth := availWidth / (numCols - 1)
+		if extra := availColWidth - t.colWidths[col]; extra > 0 {
+			availWidth += extra
+		}
+	}
 	// TODO: support weighted instead of even redistribution
 	for col := 1; col < len(t.colWidths); col++ {
-		t.colWidths[col] = availWidth / (numCols - 1)
+		availColWidth := availWidth / (numCols - 1)
+		if t.colWidths[col] > availColWidth {
+			t.colWidths[col] = availColWidth
+		}
 	}
 }