(938a887) Colour the footer's keys and merge them into their words, and bump to 0.32.2

Every key hint on the board was one flat grey string, `←→ column   ↑↓ card
/ search   y copy id   enter detail   d show done (3)   q quit`, so nothing
separated a key from what it does and a reader looking for one read the row word
by word. frig and pantop both colour the key, and the three are read side by
side.

`key_hint` is the only thing that draws a hint now: the key cyan and bold, the
description in the terminal's default foreground, one span each. The three
footer states, the prompt's two keys, the picker's row and the `q board` on the
frame's border all go through it, so the shape is learnt once and cannot drift
between rows. Cyan here and magenta in pantop is the rule and not an
inconsistency: one accent per tool, the one that tool already uses.

**A key that is its description's first letter is merged into it.** `q quit` is
drawn `quit` with the `q` coloured, `c campaign` is `campaign`, `t tag` is
`tag`. `y copy id`, `ctrl-c quit`, `d show done (2)` and every arrow row stay
split, so the row carries both forms at once, which is what the two cells are
worth on a row already at its width naming eight keys. The prefix test is case
sensitive, and that is not fussiness: a row naming both `r` and `R` would draw
one word for the two of them, and the merged form can only say which key it is
while the letter it colours is that key. frig has such a pair and needs it.

`enter` is written `↵` everywhere it is named, which is the other two cells.

The rows are lists of `(key, description)` pairs rather than format strings, so
the tab slot, the two filter keys and the `d` slot come and go by pushing a pair
or not. They were fragments carrying their own trailing spaces, spliced into
three format strings that had to agree about the spacing between them.

The frame's border hint is measured over its spans instead of one string, since
it is three of them now. It still drops the indicator first and then itself,
whole either way.

The grey was argued for in comments, and the argument is reversed rather than
deleted: the row is still chrome, but a key nobody can pick out of it is chrome
that has to be read word by word to be used. What that costs is on the prompt,
where the query now sits in the same foreground as the descriptions beside it.
The cursor is what says which half is an input, and it does that in a terminal
with no colour at all.

**The footer tests read cells, not text.** Three of the guards that keep
1b78a24 out were `!contains("q quit")`, and once `q quit` is spelled `quit`
every one of them passes whatever the row says, because the split `ctrl-c quit`
contains the merged form. `keys_on` answers with how many cells the word opens
with in the key colour: `Some(1)` is `q` quitting, `Some(0)` is the word sitting
in the tail of `ctrl-c quit`, and `None` is a key the row does not name at all.
`!contains("enter detail")` on the frame row would have joined them the moment
the spelling changed, and is now `↵ detail`.

AGENTS.md carries the rule, the merge and the case sensitivity, and the palette
gains the one colour it spends on something that is not a value.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ansho Rei
2026-08-25 13:11:31 +02:00
co-authored by Claude Opus 5
parent 00a64adca8
commit f0f88025f3
4 changed files with 345 additions and 104 deletions
+334 -97
View File
@@ -2682,31 +2682,43 @@ fn draw_frame(frame: &mut Frame, tab: &Tab, area: Rect) {
// The way out, on the border of the thing it undoes rather than in the footer. The
// footer row is already at its width naming eight keys, and this belongs beside the
// frame anyway: it is what takes the frame away. Grey because it is chrome, the colour
// the footer's own key names and the overlay's page indicator take.
// frame anyway: it is what takes the frame away. Drawn as a key hint and not as grey
// chrome, because that is what it is, and it is the one key on the board named anywhere
// but the footer: a reader who has learnt where the cyan letter is should not have to
// learn a second convention to find this one. The indicator beside it keeps the chrome
// colour, having no key in it.
//
// The page indicator follows it on the same border rather than going up beside the
// title where the overlay's sits. The title is cut against the border it is on, so an
// indicator up there would shorten a long campaign name the moment its description grew
// past three rows, and the bottom right is the standing's — which is what the frame is
// about, where this is only where the reader has got to in it.
let hint = " q board ";
let mut hint = vec![Span::raw(" ")];
hint.extend(key_hint("q", "board"));
hint.push(Span::raw(" "));
let indicator = page_indicator(offset, last, text.height, area.width).unwrap_or_default();
let room = area.width.saturating_sub(2) as usize;
let taken = spans_width(&content.standing);
let hint_width = spans_width(&hint);
let indicator_width = indicator.chars().count();
// Dropped whole rather than cut, the rule the indicator follows on the overlay: half of
// either reads as something else. The indicator goes first when the two cannot both fit,
// because with a filter on the footer's last slot names `ctrl-c quit` and this is the
// only place on the board that says `q` gives it back.
let both = format!("{hint}{indicator}");
let left = [both.as_str(), hint, ""]
.into_iter()
.find(|left| left.chars().count() + taken <= room)
.unwrap_or_default();
// only place on the board that says `q` gives it back. Measured over the spans rather
// than over one string, since the hint is three of them now.
let left = match (hint_width + indicator_width + taken <= room, hint_width + taken <= room) {
(true, _) => {
let mut both = hint;
both.push(Span::styled(indicator, Style::default().fg(Color::Grey.into())));
both
}
(false, true) => hint,
(false, false) => Vec::new(),
};
if !left.is_empty() {
block = block
.title_bottom(Line::from(Span::styled(left, Style::default().fg(Color::Grey.into()))));
block = block.title_bottom(Line::from(left));
}
block = block.title_bottom(Line::from(content.standing).right_aligned());
@@ -3379,6 +3391,56 @@ fn with_ellipsis(row: &str, width: usize) -> String {
cut
}
/// The gap between two hints on a row of keys.
const KEY_GAP: &str = " ";
/// One key hint: the key, and what pressing it does.
///
/// Two spans either way, the key and the rest of it. The key is cyan and bold and the
/// description takes the terminal's default foreground, which is the row frig and pantop
/// draw with the same division — one accent colour per tool, cyan here and magenta there.
/// The row as a whole is still chrome, but a key nobody can pick out of it is chrome that
/// has to be read word by word to be used.
///
/// **The key is merged into the description when it is the description's first letter**, so
/// `quit` is drawn with a cyan `q` and nothing in front of it while `y copy id` keeps both
/// halves. Two cells back on a row already at its width naming eight keys, and the letter
/// on screen is the key either way. The prefix test is case sensitive for that reason: a
/// board naming both `r` and `R` would draw one word for the two of them otherwise, and the
/// merged form can only say which key it is while the letter it colours *is* that key.
fn key_hint(key: &str, description: &str) -> [Span<'static>; 2] {
let rest = match description.strip_prefix(key) {
Some(rest) => rest.to_string(),
None => format!(" {description}"),
};
[
Span::styled(
key.to_string(),
Style::default()
.fg(Color::Cyan.into())
.add_modifier(Modifier::BOLD),
),
Span::raw(rest),
]
}
/// A run of hints, gap separated, closed by the space every row ends on.
///
/// The opening space is the caller's: the footer starts on one, and the prompt and the
/// picker's query row put what was typed there instead.
fn key_hints(hints: &[(&str, &str)]) -> Vec<Span<'static>> {
let mut spans = Vec::new();
for (key, description) in hints {
if !spans.is_empty() {
spans.push(Span::raw(KEY_GAP));
}
spans.extend(key_hint(key, description));
}
spans.push(Span::raw(" "));
spans
}
fn draw_footer(frame: &mut Frame, board: &Board, area: Rect) {
// The prompt takes the whole row while it is open. The footer is one line and
// already says what the state allows, and with every key going into the buffer the
@@ -3410,24 +3472,19 @@ fn draw_footer(frame: &mut Frame, board: &Board, area: Rect) {
// version of the summary line `ls` prints above a listing that leaves the terminal
// statuses out.
let d = match board.visibility.next_reveal() {
Some(status) => format!("d show {} ({})", status, column_count(board, status)),
None => "d hide both".to_string(),
};
// Only when there is a tab to move to, since the footer names keys that work.
let tabs = match board.tabbed() {
true => "tab project ",
false => "",
Some(status) => format!("show {} ({})", status, column_count(board, status)),
None => "hide both".to_string(),
};
// The last slot answers the same question in every state: how to get out of here. `q`
// takes off whatever is on top, so with a ticket open or a filter on the honest answer
// is `ctrl-c`, the only key left that quits in one press. Naming `q quit` over either
// would be the fault 1b78a24 was, a footer describing a key by what it used to do — and
// with a filter on, the frame names what that press actually does instead.
// is `ctrl-c`, the only key left that quits in one press. Going on drawing the merged
// `quit` there would be the fault 1b78a24 was, a footer describing a key by what it
// used to do — and with a filter on, the frame names what that press actually does
// instead. Split either way once the key is `ctrl-c`, which is no word's first letter.
let quit = match board.detail.is_some() || !board.current().filter.is_whole() {
true => "ctrl-c quit",
false => "q quit",
true => ("ctrl-c", "quit"),
false => ("q", "quit"),
};
// `c` and `t` are named where a reader has to find them: on the board, with nothing
@@ -3436,53 +3493,74 @@ fn draw_footer(frame: &mut Frame, board: &Board, area: Rect) {
// so the row is not at its width naming nine keys to repeat what is already on screen.
// The tag used to be drawn here for want of a frame to draw it in, which is the one
// thing 2a83bd4 took away.
let filter = match board.current().filter {
Filter::Whole => "c campaign t tag ",
_ => "",
let filter: &[(&str, &str)] = match board.current().filter {
Filter::Whole => &[("c", "campaign"), ("t", "tag")],
_ => &[],
};
// Which way `↵` will go, since the key is a toggle and the frame is already at one of
// its two heights. Naming it `expand` while it collapses would be the fault 1b78a24
// was, a footer describing a key by what it used to do.
let height = match board.current().expanded {
true => "collapse",
false => "expand",
};
// What `y` copies where the selection is. A tag is its own id, so naming it one would
// send the reader looking for seven characters on a border that prints a word.
let copied = match board.current().filter {
Filter::Tag(_) => "copy tag",
_ => "copy id",
};
let mut hints: Vec<(&str, &str)> = Vec::new();
// Only when there is a tab to move to, since the footer names keys that work.
if board.tabbed() {
hints.push(("tab", "project"));
}
// Three states, because the frame is a third place the selection can be and the row
// must describe the keys that work where it is. An open ticket wins over both, which is
// what owning `pgup` and `pgdn` means.
//
// On the frame, `↓` is the way back to the cards and the two scroll keys are the
// frame's; `y` is named because it still copies what the frame names. `enter` and `←→`
// frame's; `y` is named because it still copies what the frame names. `↵` and `←→`
// are left out because they do nothing there. Incomplete rather than wrong, the trade
// this row is allowed to make — what it must never do is name a key by what it used to
// do. `↑ frame` is not named on the board for the same reason `c` is dropped from a
// filtered board: the frame is drawn right above the columns and up is the key that
// reaches it, and the row has no cells to spend saying so.
// Which way `enter` will go, since the key is a toggle and the frame is already at one
// of its two heights. Naming it `enter expand` while it collapses would be the fault
// 1b78a24 was, a footer describing a key by what it used to do.
let height = match board.current().expanded {
true => "enter collapse",
false => "enter expand",
};
match (board.detail.is_some(), board.current().focus) {
(true, _) => hints.extend([
("←→↑↓", "select"),
("pgup/pgdn", "scroll"),
("/", "search"),
("y", "copy id"),
("↵/q", "close"),
]),
(false, Focus::Frame) => hints.extend([
("↓", "board"),
("↵", height),
("pgup/pgdn", "scroll"),
("/", "search"),
("y", copied),
]),
(false, Focus::Cards) => {
hints.extend([("←→", "column"), ("↑↓", "card"), ("/", "search")]);
hints.extend_from_slice(filter);
hints.extend([("y", "copy id"), ("↵", "detail")]);
}
}
// What `y` copies where the selection is. A tag is its own id, so naming it one would
// send the reader looking for seven characters on a border that prints a word.
let copied = match board.current().filter {
Filter::Tag(_) => "y copy tag",
_ => "y copy id",
};
hints.push(("d", d.as_str()));
hints.push(quit);
let keys = match (board.detail.is_some(), board.current().focus) {
(true, _) => format!(
" {tabs}←→↑↓ select pgup/pgdn scroll / search y copy id enter/q close {d} {quit} "
),
(false, Focus::Frame) => format!(
" {tabs}↓ board {height} pgup/pgdn scroll / search {copied} {d} {quit} "
),
(false, Focus::Cards) => format!(
" {tabs}←→ column ↑↓ card / search {filter}y copy id enter detail {d} {quit} "
),
};
frame.render_widget(
Paragraph::new(Span::styled(keys, Style::default().fg(Color::Grey.into()))),
area,
);
// The leading space is the row's own, the way every other row of the board opens on
// one; `key_hints` closes it.
let mut spans = vec![Span::raw(" ")];
spans.extend(key_hints(&hints));
frame.render_widget(Paragraph::new(Line::from(spans)), area);
}
/// What the last keypress did, where the keys would otherwise be.
@@ -3505,10 +3583,13 @@ fn draw_notice(frame: &mut Frame, notice: &Notice, area: Rect) {
/// one: ratatui shows the cursor only for a frame that asked for it, and that is also
/// what tells the reader they are in an input while the query is still empty.
///
/// What was typed is drawn in the default foreground and the keys in grey, because one
/// of them is content and the other is chrome. A miss is said beside the query it is
/// about, in brightred, since grey chrome is exactly what a reader skips. Colour
/// accentuates here as it does on a card; the words carry the meaning either way.
/// The two keys are drawn the way every other row draws them, cyan on the key and the
/// default foreground on the word, so they are findable on a row whose other half is an
/// input. That the query sits in the same foreground as the descriptions is what the
/// house style costs here, and the cursor is what says which of the two is being typed
/// into — which it does in a terminal with no colour at all. A miss stays brightred
/// beside the query it is about, being the one thing on the row that is neither a key nor
/// what was typed.
fn draw_search(frame: &mut Frame, search: &Search, area: Rect) {
let prompt = format!(" /{}", search.query);
let mut spans = vec![Span::raw(prompt.clone())];
@@ -3516,10 +3597,8 @@ fn draw_search(frame: &mut Frame, search: &Search, area: Rect) {
if search.missed {
spans.push(Span::styled(" no match", Style::default().fg(Color::BrightRed.into())));
}
spans.push(Span::styled(
" enter jump esc cancel ",
Style::default().fg(Color::Grey.into()),
));
spans.push(Span::raw(KEY_GAP));
spans.extend(key_hints(&[("↵", "jump"), ("esc", "cancel")]));
frame.render_widget(Paragraph::new(Line::from(spans)), area);
@@ -3536,21 +3615,21 @@ fn draw_search(frame: &mut Frame, search: &Search, area: Rect) {
/// is named only on the closed query, where it is the key to press, and the query's own row
/// names what `esc` does to it rather than what it does to the picker.
fn draw_picker_row(frame: &mut Frame, picker: &Picker, area: Rect) {
let grey = Style::default().fg(Color::Grey.into());
let Some(query) = &picker.query else {
frame.render_widget(
Paragraph::new(Span::styled(" ↑↓ select enter view / search esc cancel ", grey)),
area,
);
let mut spans = vec![Span::raw(" ")];
spans.extend(key_hints(&[
("↑↓", "select"),
("↵", "view"),
("/", "search"),
("esc", "cancel"),
]));
frame.render_widget(Paragraph::new(Line::from(spans)), area);
return;
};
let prompt = format!(" /{query}");
let spans = vec![
Span::raw(prompt.clone()),
Span::styled(" ↑↓ select enter view esc clear ", grey),
];
let mut spans = vec![Span::raw(prompt.clone()), Span::raw(KEY_GAP)];
spans.extend(key_hints(&[("↑↓", "select"), ("↵", "view"), ("esc", "clear")]));
frame.render_widget(Paragraph::new(Line::from(spans)), area);
// Held on the row, the way the search prompt's cursor is, so a query longer than the
@@ -4142,6 +4221,77 @@ mod tests {
render(board, width, height).pop().expect("no rows rendered")
}
/// The cells of the footer row, as symbol, colour and modifier.
///
/// The row is the only place on the board where what a thing *is* is carried by its
/// colour alone: the key merged into its description is one letter of a word, so the
/// flattened row cannot say whether `quit` is a key or the tail of `ctrl-c quit`.
fn footer_cells(
board: &Board,
width: u16,
height: u16,
) -> Vec<(String, ratatui::style::Color, Modifier)> {
let mut terminal = Terminal::new(TestBackend::new(width, height)).unwrap();
terminal.draw(|frame| draw(frame, board)).unwrap();
let buffer = terminal.backend().buffer().clone();
let row = buffer.area.height - 1;
(0..buffer.area.width)
.map(|x| {
let cell = &buffer[(x, row)];
(cell.symbol().to_string(), cell.fg, cell.modifier)
})
.collect()
}
/// Where `text` starts on the footer, in cells.
fn footer_at(cells: &[(String, ratatui::style::Color, Modifier)], text: &str) -> Option<usize> {
let wanted: Vec<String> = text.chars().map(|c| c.to_string()).collect();
(0..=cells.len().saturating_sub(wanted.len())).find(|&at| {
cells[at..at + wanted.len()]
.iter()
.zip(&wanted)
.all(|((symbol, ..), c)| symbol == c)
})
}
/// How many cells the first `text` on the footer opens with in the key colour, and
/// `None` when the row does not hold it at all.
///
/// One number answers both forms the row draws. Merged, `quit` is `Some(1)`: the `q`
/// alone is a key and the rest of the word is description. Split, `ctrl-c quit` is
/// `Some(6)`, and asking about `quit` on that row is `Some(0)` — the word is there and
/// no part of it is a key. The flattened row cannot tell those two apart, since the
/// split form contains the merged one, and which key quits from where is exactly what
/// the tests below are about.
fn keys_on(board: &Board, width: u16, height: u16, text: &str) -> Option<usize> {
let cells = footer_cells(board, width, height);
let at = footer_at(&cells, text)?;
let key: ratatui::style::Color = Color::Cyan.into();
Some(
cells[at..at + text.chars().count()]
.iter()
.take_while(|(_, colour, _)| *colour == key)
.count(),
)
}
/// The colour and modifier the first cell of `text` reached the screen in.
fn footer_style(
board: &Board,
width: u16,
height: u16,
text: &str,
) -> (ratatui::style::Color, Modifier) {
let cells = footer_cells(board, width, height);
let at = footer_at(&cells, text).unwrap_or_else(|| panic!("no `{text}` on the footer"));
let (_, colour, modifier) = cells[at].clone();
(colour, modifier)
}
/// The overlay's top border row, where the block title sits.
///
/// Counted in characters rather than bytes: the rows carry multi-byte glyphs.
@@ -5768,16 +5918,21 @@ mod tests {
let closed = render(&board, SCREEN.width, SCREEN.height).join("\n");
assert!(closed.contains("↑↓ card"), "{closed}");
assert!(closed.contains("enter detail"), "{closed}");
assert!(closed.contains("↵ detail"), "{closed}");
assert!(!closed.contains("scroll"), "a scroll offered with nothing open:\n{closed}");
assert!(closed.contains("q quit"), "nothing says how to leave:\n{closed}");
// The merged form: the word alone, with `q` the only cell of it drawn as a key.
assert_eq!(
keys_on(&board, SCREEN.width, SCREEN.height, "quit"),
Some(1),
"nothing says how to leave:\n{closed}"
);
board.toggle_detail();
let open = render(&board, SCREEN.width, SCREEN.height).join("\n");
assert!(open.contains("pgup/pgdn scroll"), "{open}");
assert!(open.contains("select"), "{open}");
assert!(open.contains("enter/q close"), "{open}");
assert!(open.contains("↵/q close"), "{open}");
}
/// The other half of giving `q` a second meaning. A footer that goes on saying
@@ -5792,11 +5947,80 @@ mod tests {
board.toggle_detail();
let row = footer(&board, 120, 20);
assert!(row.contains("enter/q close"), "q is not named as the close key:\n{row}");
assert!(!row.contains("q quit"), "q still offered as the quit key:\n{row}");
assert!(row.contains("↵/q close"), "q is not named as the close key:\n{row}");
// Nothing on the row is drawn as `q` quitting. Asked of the flattened row this is
// unanswerable now: `ctrl-c quit` holds the word the merged form is.
assert_eq!(
keys_on(&board, 120, 20, "quit"),
Some(0),
"q still offered as the quit key:\n{row}"
);
// And the last slot still answers how to get out, which from here is the one
// key that does it in a single press.
assert!(row.contains("ctrl-c quit"), "nothing says what quits from here:\n{row}");
// key that does it in a single press, split because `ctrl-c` is no word's letter.
assert_eq!(
keys_on(&board, 120, 20, "ctrl-c quit"),
Some(6),
"nothing says what quits from here:\n{row}"
);
}
/// The division the row is drawn on: the key carries the accent colour and the words
/// beside it carry none. Everything else about which key is named where is text, and
/// this is the one thing that is not.
#[test]
fn a_key_is_the_accent_colour_and_its_description_is_the_default_foreground() {
let dir = board_dir();
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
let board = one_board(&dir);
let key: ratatui::style::Color = Color::Cyan.into();
// Merged: the `q` of `quit` is the key and the rest of the word is not.
let (colour, modifier) = footer_style(&board, 120, 20, "quit");
assert_eq!(colour, key, "the key did not reach the screen as one");
assert!(modifier.contains(Modifier::BOLD), "the key is not bold: {modifier:?}");
let (colour, modifier) = footer_style(&board, 120, 20, "uit");
assert_eq!(
colour,
ratatui::style::Color::Reset,
"the description took the key's colour"
);
assert!(!modifier.contains(Modifier::BOLD), "the description is bold: {modifier:?}");
// Split: the same division across two words instead of inside one.
assert_eq!(footer_style(&board, 120, 20, "y copy id").0, key);
assert_eq!(footer_style(&board, 120, 20, "copy id").0, ratatui::style::Color::Reset);
}
/// The prompt and the picker take the row from the footer, and draw the keys they leave
/// on it the way the footer does: a reader who has learnt where the coloured letter is
/// does not learn it again per row.
#[test]
fn the_prompt_and_the_picker_draw_their_keys_as_the_footer_does() {
let dir = board_dir();
write_campaign(&dir, V1, "First public release", "v1", "For a public tag.");
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
let mut board = one_board(&dir);
let key: ratatui::style::Color = Color::Cyan.into();
board.open_search();
assert_eq!(footer_style(&board, 120, 20, "↵ jump").0, key, "the prompt's key");
assert_eq!(
footer_style(&board, 120, 20, "jump").0,
ratatui::style::Color::Reset,
"the prompt's description"
);
board.search_key(typed(KeyCode::Esc), SCREEN);
board.open_picker(PickerKind::Campaign, SCREEN);
assert_eq!(footer_style(&board, 120, 20, "↵ view").0, key, "the picker's key");
assert_eq!(
footer_style(&board, 120, 20, "view").0,
ratatui::style::Color::Reset,
"the picker's description"
);
}
// ------------------------------------------------------------------- searching --
@@ -5843,9 +6067,9 @@ mod tests {
let screen = render(&board, SCREEN.width, SCREEN.height);
let row = screen.last().expect("no rows rendered");
assert!(row.contains("enter jump"), "{row}");
assert!(row.contains("↵ jump"), "{row}");
assert!(row.contains("esc cancel"), "{row}");
assert!(!row.contains("q quit"), "the key list survived the prompt:\n{row}");
assert!(!row.contains("quit"), "the key list survived the prompt:\n{row}");
assert!(
screen.join("\n").contains("Alpha first"),
"the board went away behind the prompt"
@@ -6285,7 +6509,11 @@ mod tests {
assert!(board.notice.is_none(), "the message outlived its keypress");
// And the keys are back, rather than the row staying spent on a read message.
let row = footer(&board, 120, 20);
assert!(row.contains("q quit"), "the key list did not come back: {row}");
assert_eq!(
keys_on(&board, 120, 20, "quit"),
Some(1),
"the key list did not come back: {row}"
);
}
/// Both footers name it, since the key works with a ticket open as well.
@@ -8216,14 +8444,23 @@ mod tests {
let dir = board_dir();
let mut board = tag_board(&dir);
// Both merged, being their own words' first letters.
let plain = footer(&board, 120, 20);
assert!(plain.contains("t tag"), "the tag key is not named: {plain}");
assert!(plain.contains("c campaign"), "{plain}");
assert_eq!(
keys_on(&board, 120, 20, "tag"),
Some(1),
"the tag key is not named: {plain}"
);
assert_eq!(keys_on(&board, 120, 20, "campaign"), Some(1), "{plain}");
board.select_filter(Filter::Tag("bug".to_string()), SCREEN);
let filtered = footer(&board, 120, 20);
assert!(!filtered.contains("q board"), "the row repeated the frame: {filtered}");
assert!(!filtered.contains("t tag"), "a key that filters again: {filtered}");
assert_eq!(
keys_on(&board, 120, 20, "tag"),
None,
"a key that filters again: {filtered}"
);
assert!(filtered.contains("ctrl-c quit"), "{filtered}");
}
@@ -9196,7 +9433,7 @@ mod tests {
assert!(row.contains("pgup/pgdn scroll"), "the scroll keys are not named:\n{row}");
assert!(row.contains("y copy id"), "the copy key is not named:\n{row}");
// Both do nothing here, so neither is offered.
assert!(!row.contains("enter detail"), "enter is named and does nothing:\n{row}");
assert!(!row.contains("↵ detail"), "↵ is named and does nothing:\n{row}");
assert!(
!row.contains("←→ column"),
"the column keys are named and do nothing:\n{row}"
@@ -9613,12 +9850,12 @@ mod tests {
board.select_card(-1, SCREEN);
let row = footer(&board, 120, 20);
assert!(row.contains("enter expand"), "enter is not named on the frame:\n{row}");
assert!(row.contains("↵ expand"), "↵ is not named on the frame:\n{row}");
board.toggle_focused(SCREEN);
let row = footer(&board, 120, 20);
assert!(row.contains("enter collapse"), "enter still offered as expand:\n{row}");
assert!(!row.contains("enter expand"), "the row names it both ways:\n{row}");
assert!(row.contains("↵ collapse"), "↵ still offered as expand:\n{row}");
assert!(!row.contains("↵ expand"), "the row names it both ways:\n{row}");
}
/// Expanding and collapsing leave the reader where they were rather than at the top. The
@@ -9889,7 +10126,7 @@ mod tests {
assert!(row.contains("Move the store off one disk."), "{row:?}");
// And the footer is the picker's while it is open, for the reason the prompt takes
// it: the board's key list describes nothing that currently works.
assert!(footer(&board, 100, 24).contains("enter view"), "the footer is the board's");
assert!(footer(&board, 100, 24).contains("↵ view"), "the footer is the board's");
}
/// A campaign with no codename shows the id once, not twice: the row already opens
@@ -10378,12 +10615,12 @@ mod tests {
let dir = board_dir();
let mut board = campaign_board(&dir);
assert!(footer(&board, 120, 24).contains("c campaign"), "the key is unfindable");
assert_eq!(keys_on(&board, 120, 24, "campaign"), Some(1), "the key is unfindable");
board.select_filter(Filter::Campaign(V1.to_string()), SCREEN);
let footer = footer(&board, 120, 24);
assert!(footer.contains("ctrl-c quit"), "q still claims to quit: {footer:?}");
assert!(!footer.contains("q quit"), "{footer:?}");
let row = footer(&board, 120, 24);
assert!(row.contains("ctrl-c quit"), "q still claims to quit: {row:?}");
assert_eq!(keys_on(&board, 120, 24, "quit"), Some(0), "{row:?}");
}
/// The filter belongs to the tab, not the board: a campaign is resolved inside one