Commit `6cc1494e6b`

6cc1494e6b6e254f073e5fe1ca0af6e58b0f731d

parent: 0c0ae8e08b

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-02 03:12 UTC

control: tables name their columns only when they hold numbers

Ref #317

Layout: unified · split

internal/control/search_test.go +7 −11

 	"testing"
 )
-// A repo hit has no state, an issue/mr hit does. At a terminal both must
+// A repo hit has no state, an issue/mr hit does. At a terminal both
-// still put TITLE under the TITLE header, not have the repo's title slide
+// titles must start in the same column, not have the repo's title slide
-// left under STATE.
+// left into the state column.
 func TestSearchTableAlignsTitleAtTerminal(t *testing.T) {
 	results := []SearchResult{
 		{Kind: "repo", Repo: "alice/webapp", Title: "a web application"},
 	writeSearchTable(&Ctx{Term: Term{Cols: 100}}, &b, results)
 	lines := strings.Split(strings.TrimRight(b.String(), "\n"), "\n")
-	if len(lines) != 3 {
+	if len(lines) != 2 {
-		t.Fatalf("want header + 2 rows, got %d lines:\n%s", len(lines), b.String())
+		t.Fatalf("want 2 rows, got %d lines:\n%s", len(lines), b.String())
 	}
-	header, repoRow, issueRow := lines[0], lines[1], lines[2]
+	repoRow, issueRow := lines[0], lines[1]
-	titleAt := strings.Index(header, "TITLE")
 	repoTitleAt := strings.Index(repoRow, "a web application")
 	issueTitleAt := strings.Index(issueRow, "memory leak")
-	if titleAt < 0 || repoTitleAt < 0 || issueTitleAt < 0 {
+	if repoTitleAt < 0 || issueTitleAt < 0 {
 		t.Fatalf("columns not found:\n%s", b.String())
 	}
 	if repoTitleAt != issueTitleAt {
 		t.Errorf("titles not aligned: repo row at %d, issue row at %d\n%s", repoTitleAt, issueTitleAt, b.String())
 	}
-	if repoTitleAt != titleAt {
-		t.Errorf("title not under TITLE header: header at %d, repo row at %d\n%s", titleAt, repoTitleAt, b.String())
-	}
 }
 // Plain output has no header to align to, so a repo row stays 3 cells —

internal/control/table.go +38 −9

 // table is a list command's rows. Plain, each row is written as it
 // comes, tab-separated with no header. At a terminal rows are held
-// until flush, then written under a header, padded, and fitted to the
+// until flush, then padded and fitted to the width, under a header only
-// width.
+// when a column holds numbers.
 type table struct {
 	term   Term
 	w      io.Writer
 	if t.term.Cols == 0 || len(t.rows) == 0 {
 		return
 	}
+	var b strings.Builder
+	for _, l := range t.lines() {
+		b.WriteString(l + "\n")
+	}
+	io.WriteString(t.w, b.String())
+}
+// numeric reports whether a column holds numbers or sizes, which need a
+// header to say what they count.
+func (t *table) numeric() bool {
+	for _, r := range t.rows {
+		for _, c := range r {
+			if c.kind == kindNum || c.kind == kindSize {
+				return true
+			}
+		}
+	}
+	return false
+}
+// lines lays the rows out at the terminal width: a dim header first
+// only when a column is a number, then each row padded and painted.
+func (t *table) lines() []string {
+	if !t.numeric() {
+		t.header = nil
+	}
 	t.dropEmpty()
 	// The column count is never smaller than the longest row: a row with
 	// more cells than the header has still gets every cell rendered, the
 	t.capSparse(widths)
 	t.fit(widths)
-	var b strings.Builder
+	var out []string
 	line := make([]string, n)
-	for i := range line {
+	if len(t.header) > 0 {
-		if i < len(t.header) {
+		for i := range line {
-			line[i] = clip(t.header[i], widths[i])
+			line[i] = ""
+			if i < len(t.header) {
+				line[i] = clip(t.header[i], widths[i])
+			}
 		}
+		out = append(out, t.term.paint(sgrDim, strings.TrimRight(t.join(line, widths), " ")))
 	}
-	b.WriteString(t.term.paint(sgrDim, strings.TrimRight(t.join(line, widths), " ")) + "\n")
 	for _, r := range t.rows {
 		for i := 0; i < n; i++ {
 			s := ""
 			}
 			line[i] = s
 		}
-		b.WriteString(strings.TrimRight(t.joinRow(r, line, widths), " ") + "\n")
+		out = append(out, strings.TrimRight(t.joinRow(r, line, widths), " "))
 	}
-	io.WriteString(t.w, b.String())
+	return out
 }
 // dropEmpty removes a column that is blank on every row, header and

internal/control/table_test.go +54 −24

 func TestTableTerminalFits(t *testing.T) {
 	var b bytes.Buffer
 	fixtureTable(&Ctx{Term: Term{Cols: 40}}, &b)
-	want := "#     STATE   TITLE           AUTHOR\n" +
+	want := "#252  open    Dependency up…  gitbay-bot\n" +
-		"#252  open    Dependency up…  gitbay-bot\n" +
 		"#12   closed  Android app     cmc\n"
 	if b.String() != want {
 		t.Errorf("terminal:\n%s\nwant\n%s", b.String(), want)
 	}
 }
-// A column shrunk below its header's width clips the header too.
+// A column shrunk below its header's width clips the header too. The
+// number column is what keeps the header.
 func TestTableClipsHeaderToColumn(t *testing.T) {
 	var b bytes.Buffer
-	tb := (&Ctx{Term: Term{Cols: 16}}).table(&b, "FINGERPRINT", "SCOPE")
+	tb := (&Ctx{Term: Term{Cols: 12}}).table(&b, "FINGERPRINTS", "N")
-	tb.row(cFlex("SHA256:abcdefghijklmnopqrstuvwxyz"), cState("full"))
+	tb.row(cFlex("SHA256:abcdefghijklmnopqrstuvwxyz"), cNum(1))
 	tb.flush()
 	for _, line := range strings.Split(strings.TrimSuffix(b.String(), "\n"), "\n") {
-		if cells(line) > 16 {
+		if cells(line) > 12 {
-			t.Errorf("line of %d cells at 16 columns: %q", cells(line), line)
+			t.Errorf("line of %d cells at 12 columns: %q", cells(line), line)
 		}
 	}
-	if !strings.HasPrefix(b.String(), "FINGERPR…  SCOPE\n") {
+	if !strings.HasPrefix(b.String(), "FINGERPR…  N\n") {
 		t.Errorf("header:\n%s", b.String())
 	}
 }
 	if !strings.Contains(colour.String(), sgrGreen+"open"+sgrReset) {
 		t.Errorf("open not green: %q", colour.String())
 	}
-	if !strings.HasPrefix(colour.String(), sgrDim) {
+	if !strings.HasPrefix(colour.String(), sgrDim+"#252"+sgrReset) {
-		t.Errorf("header not dim: %q", colour.String())
+		t.Errorf("ref not dim: %q", colour.String())
 	}
 	if stripSGR(colour.String()) != mono.String() {
 		t.Errorf("colour changed the layout:\n%s\nvs\n%s", stripSGR(colour.String()), mono.String())
 	if plain.String() != "#1\t2026-09-23T10:00:00Z\n" {
 		t.Errorf("plain = %q", plain.String())
 	}
-	if term.String() != "#   UPDATED\n#1  2h ago\n" {
+	if term.String() != "#1  2h ago\n" {
 		t.Errorf("term = %q", term.String())
 	}
 }
 		t.Fatalf("archived marker dropped:\n%s", out)
 	}
 	lines := strings.Split(strings.TrimRight(out, "\n"), "\n")
-	if len(lines) != 3 {
+	if len(lines) != 2 {
-		t.Fatalf("want 3 lines, got %d:\n%s", len(lines), out)
+		t.Fatalf("want 2 lines, got %d:\n%s", len(lines), out)
 	}
-	header, row1, row2 := lines[0], lines[1], lines[2]
+	oneAt := strings.Index(lines[0], "one")
-	descAt := strings.Index(header, "DESCRIPTION")
+	twoAt := strings.Index(lines[1], "two")
-	oneAt := strings.Index(row1, "one")
+	if oneAt < 0 || twoAt < 0 {
-	twoAt := strings.Index(row2, "two")
-	if descAt < 0 || oneAt < 0 || twoAt < 0 {
 		t.Fatalf("columns not found:\n%s", out)
 	}
-	if descAt != oneAt || descAt != twoAt {
+	if oneAt != twoAt {
-		t.Errorf("DESCRIPTION column not aligned: header at %d, row1 at %d, row2 at %d\n%s", descAt, oneAt, twoAt, out)
+		t.Errorf("description column not aligned: row1 at %d, row2 at %d\n%s", oneAt, twoAt, out)
 	}
 }
 	tb.row(cRef("v0"), cFlex(strings.Repeat("x", 60)), cText("2"))
 	tb.flush()
 	lines := strings.Split(b.String(), "\n")
-	if at := strings.Index(lines[0], "ASSETS"); at != len("TAG  ")+30+2 {
+	if at := strings.LastIndex(lines[0], "2"); at != len("v3  ")+30+2 {
-		t.Errorf("ASSETS at %d:\n%s", at, b.String())
+		t.Errorf("assets at %d:\n%s", at, b.String())
 	}
 }
 	tb.row(cRef("#1"), cText(""), cFlex("one"))
 	tb.row(cRef("#2"), cText(""), cFlex("two"))
 	tb.flush()
-	if b.String() != "#   TITLE\n#1  one\n#2  two\n" {
+	if b.String() != "#1  one\n#2  two\n" {
 		t.Errorf("terminal = %q", b.String())
 	}
 	var plain bytes.Buffer
 		}
 	}
 }
+func TestTableDropsHeaderWithoutNumbers(t *testing.T) {
+	var b bytes.Buffer
+	tb := (&Ctx{Term: Term{Cols: 80}}).table(&b, "#", "STATE", "TITLE")
+	tb.row(cRef("#12"), cState("open"), cFlex("Android app"))
+	tb.flush()
+	if got, want := b.String(), "#12  open  Android app\n"; got != want {
+		t.Errorf("got %q, want %q", got, want)
+	}
+}
+func TestTableKeepsHeaderForNumbers(t *testing.T) {
+	var b bytes.Buffer
+	tb := (&Ctx{Term: Term{Cols: 80}}).table(&b, "RUNNER", "PENDING")
+	tb.row(cText("bay1"), cNum(3))
+	tb.flush()
+	if !strings.HasPrefix(b.String(), "RUNNER  PENDING\n") {
+		t.Errorf("header missing: %q", b.String())
+	}
+}
+func TestTableLines(t *testing.T) {
+	var b bytes.Buffer
+	tb := (&Ctx{Term: Term{Cols: 80}}).table(&b)
+	tb.row(cRef("!1"), cFlex("one"))
+	tb.row(cRef("!22"), cFlex("two"))
+	got := tb.lines()
+	want := []string{"!1   one", "!22  two"}
+	if strings.Join(got, "\n") != strings.Join(want, "\n") {
+		t.Errorf("got %q, want %q", got, want)
+	}
+}

Commit 6cc1494e6b

Commit `6cc1494e6b`