fiddlerwoaroof/improvise
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(test): split let statements and clean up vec! macro

Browse Source 
Split multi-line let statements in command tests into separate lines.
Remove unnecessary commas and inline vec! macro. Clean up test code
formatting for readability. No functional changes, only style improvements.

Co-Authored-By: fiddlerwoaroof/git-smart-commit (bartowski/nvidia_Nemotron-Cascade-2-30B-A3B-GGUF)
This commit is contained in:
Edward Langley
2026-04-07 02:15:43 -07:00
parent 5566d7349b
commit 3885fc19c8
2 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/command/cmd.rs
View File

@ -421,10 +421,7 @@ impl Cmd for SaveAndQuit {
"wq" "wq"
} }
fn execute(&self, _ctx: &CmdContext) -> Vec<Box<dyn Effect>> { fn execute(&self, _ctx: &CmdContext) -> Vec<Box<dyn Effect>> {
vec![ vec![Box::new(effect::Save), effect::change_mode(AppMode::Quit)]
Box::new(effect::Save),
effect::change_mode(AppMode::Quit),
]
} }
} }
@ -2821,7 +2818,11 @@ mod tests {
GridLayout::new(model, model.active_view()) GridLayout::new(model, model.active_view())
} }
fn make_ctx<'a>(model: &'a Model, layout: &'a GridLayout, registry: &'a CmdRegistry) -> CmdContext<'a> { fn make_ctx<'a>(
model: &'a Model,
layout: &'a GridLayout,
registry: &'a CmdRegistry,
) -> CmdContext<'a> {
let view = model.active_view(); let view = model.active_view();
let (sr, sc) = view.selected; let (sr, sc) = view.selected;
CmdContext { CmdContext {
@ -2875,7 +2876,8 @@ mod tests {
fn move_selection_down_produces_set_selected() { fn move_selection_down_produces_set_selected() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = Move { let cmd = Move {
kind: MoveKind::Relative(1, 0), kind: MoveKind::Relative(1, 0),
cursor: CursorState::from_ctx(&ctx), cursor: CursorState::from_ctx(&ctx),
@ -2890,7 +2892,8 @@ mod tests {
fn move_selection_clamps_to_bounds() { fn move_selection_clamps_to_bounds() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
// Try to move way past the end // Try to move way past the end
let cmd = Move { let cmd = Move {
kind: MoveKind::Relative(100, 100), kind: MoveKind::Relative(100, 100),
@ -2907,7 +2910,8 @@ mod tests {
let mut bufs = HashMap::new(); let mut bufs = HashMap::new();
bufs.insert("command".to_string(), "q".to_string()); bufs.insert("command".to_string(), "q".to_string());
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let mut ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let mut ctx = make_ctx(&m, &layout, &reg);
ctx.dirty = true; ctx.dirty = true;
ctx.buffers = &bufs; ctx.buffers = &bufs;
let cmd = ExecuteCommand; let cmd = ExecuteCommand;
@ -2922,7 +2926,8 @@ mod tests {
let mut bufs = HashMap::new(); let mut bufs = HashMap::new();
bufs.insert("command".to_string(), "q".to_string()); bufs.insert("command".to_string(), "q".to_string());
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let mut ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let mut ctx = make_ctx(&m, &layout, &reg);
ctx.buffers = &bufs; ctx.buffers = &bufs;
let cmd = ExecuteCommand; let cmd = ExecuteCommand;
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
@ -2941,7 +2946,8 @@ mod tests {
]); ]);
m.set_cell(key, CellValue::Number(42.0)); m.set_cell(key, CellValue::Number(42.0));
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = ClearCellCommand { let cmd = ClearCellCommand {
key: ctx.cell_key().clone().unwrap(), key: ctx.cell_key().clone().unwrap(),
}; };
@ -2958,7 +2964,8 @@ mod tests {
]); ]);
m.set_cell(key, CellValue::Number(99.0)); m.set_cell(key, CellValue::Number(99.0));
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = YankCell { let cmd = YankCell {
key: ctx.cell_key().clone().unwrap(), key: ctx.cell_key().clone().unwrap(),
}; };
@ -2970,7 +2977,8 @@ mod tests {
fn toggle_panel_open_and_focus() { fn toggle_panel_open_and_focus() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = TogglePanelAndFocus { let cmd = TogglePanelAndFocus {
panel: effect::Panel::Formula, panel: effect::Panel::Formula,
open: true, open: true,
@ -2989,7 +2997,8 @@ mod tests {
fn toggle_panel_close_and_unfocus() { fn toggle_panel_close_and_unfocus() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = TogglePanelAndFocus { let cmd = TogglePanelAndFocus {
panel: effect::Panel::Formula, panel: effect::Panel::Formula,
open: false, open: false,
@ -3003,7 +3012,8 @@ mod tests {
fn enter_advance_moves_down() { fn enter_advance_moves_down() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = EnterAdvance { let cmd = EnterAdvance {
cursor: CursorState::from_ctx(&ctx), cursor: CursorState::from_ctx(&ctx),
}; };
@ -3020,7 +3030,8 @@ mod tests {
fn search_navigate_with_empty_query_returns_nothing() { fn search_navigate_with_empty_query_returns_nothing() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = SearchNavigate(true); let cmd = SearchNavigate(true);
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
assert!(effects.is_empty()); assert!(effects.is_empty());
@ -3030,7 +3041,8 @@ mod tests {
fn enter_edit_mode_produces_editing_mode() { fn enter_edit_mode_produces_editing_mode() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = EnterEditMode { let cmd = EnterEditMode {
initial_value: String::new(), initial_value: String::new(),
}; };
@ -3044,7 +3056,8 @@ mod tests {
fn enter_tile_select_with_categories() { fn enter_tile_select_with_categories() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = EnterTileSelect; let cmd = EnterTileSelect;
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
assert_eq!(effects.len(), 2); // SetTileCatIdx + ChangeMode assert_eq!(effects.len(), 2); // SetTileCatIdx + ChangeMode
@ -3061,7 +3074,8 @@ mod tests {
// select always has something to operate on. // select always has something to operate on.
let m = Model::new("Empty"); let m = Model::new("Empty");
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = EnterTileSelect; let cmd = EnterTileSelect;
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
assert_eq!(effects.len(), 2); // SetTileCatIdx + ChangeMode assert_eq!(effects.len(), 2); // SetTileCatIdx + ChangeMode
@ -3071,7 +3085,8 @@ mod tests {
fn toggle_group_under_cursor_returns_empty_without_groups() { fn toggle_group_under_cursor_returns_empty_without_groups() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = ToggleGroupAtCursor { is_row: true }; let cmd = ToggleGroupAtCursor { is_row: true };
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
// No groups defined, so nothing to toggle // No groups defined, so nothing to toggle
@ -3082,7 +3097,8 @@ mod tests {
fn search_or_category_add_without_query_opens_category_add() { fn search_or_category_add_without_query_opens_category_add() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = SearchOrCategoryAdd; let cmd = SearchOrCategoryAdd;
let effects = cmd.execute(&ctx); let effects = cmd.execute(&ctx);
assert_eq!(effects.len(), 2); // SetPanelOpen + ChangeMode assert_eq!(effects.len(), 2); // SetPanelOpen + ChangeMode
@ -3097,7 +3113,8 @@ mod tests {
fn cycle_panel_focus_with_no_panels_open() { fn cycle_panel_focus_with_no_panels_open() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = CyclePanelFocus { let cmd = CyclePanelFocus {
formula_open: false, formula_open: false,
category_open: false, category_open: false,
@ -3111,7 +3128,8 @@ mod tests {
fn cycle_panel_focus_with_formula_panel_open() { fn cycle_panel_focus_with_formula_panel_open() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let mut ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let mut ctx = make_ctx(&m, &layout, &reg);
ctx.formula_panel_open = true; ctx.formula_panel_open = true;
let cmd = CyclePanelFocus { let cmd = CyclePanelFocus {
formula_open: true, formula_open: true,
@ -3139,7 +3157,8 @@ mod tests {
fn law_move_to_start_idempotent() { fn law_move_to_start_idempotent() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = Move { let cmd = Move {
kind: MoveKind::ToStart(true), kind: MoveKind::ToStart(true),
cursor: CursorState::from_ctx(&ctx), cursor: CursorState::from_ctx(&ctx),
@ -3165,7 +3184,8 @@ mod tests {
fn law_toggle_group_involution() { fn law_toggle_group_involution() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = ToggleGroupAtCursor { is_row: true }; let cmd = ToggleGroupAtCursor { is_row: true };
let first = effects_debug(&cmd.execute(&ctx)); let first = effects_debug(&cmd.execute(&ctx));
let second = effects_debug(&cmd.execute(&ctx)); let second = effects_debug(&cmd.execute(&ctx));
@ -3181,7 +3201,8 @@ mod tests {
fn law_sequence_associativity() { fn law_sequence_associativity() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let mk_a = || { let mk_a = || {
Move { Move {
@ -3231,7 +3252,8 @@ mod tests {
fn law_move_to_end_reaches_last_col() { fn law_move_to_end_reaches_last_col() {
let m = two_cat_model(); let m = two_cat_model();
let layout = make_layout(&m); let layout = make_layout(&m);
let reg = default_registry(); let ctx = make_ctx(&m, &layout, &reg); let reg = default_registry();
let ctx = make_ctx(&m, &layout, &reg);
let cmd = Move { let cmd = Move {
kind: MoveKind::ToEnd(false), kind: MoveKind::ToEnd(false),
cursor: CursorState::from_ctx(&ctx), cursor: CursorState::from_ctx(&ctx),

1
src/model/types.rs
View File

@ -263,7 +263,6 @@ impl Model {
self.data.get(key).cloned() self.data.get(key).cloned()
} }
/// Evaluate a cell, aggregating over any hidden (None-axis) categories. /// Evaluate a cell, aggregating over any hidden (None-axis) categories.
/// When `none_cats` is empty, delegates to `evaluate`. /// When `none_cats` is empty, delegates to `evaluate`.
/// Otherwise, uses `matching_cells` with the partial key and aggregates /// Otherwise, uses `matching_cells` with the partial key and aggregates