Merge pull request #37 from RivoLink/feat/path-viewer-popup

+14

src/app/mod.rs

··· 116 116 status_line: Line<'static>, 117 117 status_cache_key: Option<StatusCacheKey>, 118 118 pub(super) help_open: bool, 119 + pub(super) path_popup_open: bool, 119 120 pub(super) file_picker: FilePickerState, 120 121 pub(super) pending_picker: PendingPicker, 121 122 pub(super) picker_load_state: PickerLoadState, ··· 214 215 status_line: Line::default(), 215 216 status_cache_key: None, 216 217 help_open: false, 218 + path_popup_open: false, 217 219 file_picker: FilePickerState { 218 220 open: false, 219 221 mode: FilePickerMode::Browser, ··· 456 458 457 459 pub(crate) fn is_help_open(&self) -> bool { 458 460 self.help_open 461 + } 462 + 463 + pub(crate) fn open_path_popup(&mut self) { 464 + self.path_popup_open = true; 465 + } 466 + 467 + pub(crate) fn close_path_popup(&mut self) { 468 + self.path_popup_open = false; 469 + } 470 + 471 + pub(crate) fn is_path_popup_open(&self) -> bool { 472 + self.path_popup_open 459 473 } 460 474 461 475 pub(crate) fn clear_reload_flash(&mut self) {

+2

src/main.rs

··· 36 36 #[cfg(test)] 37 37 pub(crate) use read_stdin_limited as read_stdin_with_limit; 38 38 #[cfg(test)] 39 + pub(crate) use render::wrap_path_lines; 40 + #[cfg(test)] 39 41 pub(crate) use runtime::should_handle_key; 40 42 #[cfg(test)] 41 43 pub(crate) use theme::{parse_theme_preset, theme_preset_label, ThemePreset, THEME_PRESETS};

+4

src/render/mod.rs

··· 9 9 Frame, 10 10 }; 11 11 12 + #[cfg(test)] 13 + pub(crate) use modal::wrap_path_lines; 12 14 pub(crate) use status::build_status_bar; 13 15 pub(crate) use toc::{build_toc_line_with_index, toc_header_line}; 14 16 ··· 51 53 modal::render_theme_picker(f, app); 52 54 } else if app.is_editor_picker_open() { 53 55 modal::render_editor_picker(f, app); 56 + } else if app.is_path_popup_open() { 57 + modal::render_path_popup(f, app); 54 58 } 55 59 } 56 60

+96 -4

src/render/modal.rs

·········

+17 -1

src/runtime.rs

··· 316 316 KeyCode::Char('k') | KeyCode::Up => app.move_editor_picker_up(), 317 317 _ => state_changed = false, 318 318 } 319 + } else if app.is_path_popup_open() { 320 + match key.code { 321 + KeyCode::Enter | KeyCode::Esc | KeyCode::Char('p') => { 322 + app.close_path_popup() 323 + } 324 + KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => { 325 + app.close_path_popup(); 326 + } 327 + _ => state_changed = false, 328 + } 319 329 } else if app.is_search_mode() { 320 330 match key.code { 321 331 KeyCode::Esc => app.cancel_search(), ··· 396 406 KeyCode::Char('P') => { 397 407 app.queue_file_picker(app.picker_dir()); 398 408 } 409 + KeyCode::Char('p') => { 410 + app.open_path_popup(); 411 + } 399 412 KeyCode::Char(c) if c.is_ascii_digit() && c != '0' => { 400 413 if let Some(n) = c.to_digit(10) { 401 414 app.jump_to_toc(n as usize - 1); ··· 414 427 Event::Mouse(mouse) => { 415 428 let prev_pos = app.mouse_position; 416 429 app.mouse_position = (mouse.column, mouse.row); 417 - let state_changed = if app.is_file_picker_open() || app.is_theme_picker_open() { 430 + let state_changed = if app.is_file_picker_open() 431 + || app.is_theme_picker_open() 432 + || app.is_path_popup_open() 433 + { 418 434 if matches!(mouse.kind, MouseEventKind::Up(..)) { 419 435 app.scrollbar_dragging = false; 420 436 }

+76

src/tests/render.rs

··· 1 1 use super::{find_symbol, render_buffer, test_assets}; 2 2 use crate::markdown::parse_markdown; 3 + use crate::wrap_path_lines; 4 + use ratatui::style::Style; 3 5 4 6 #[test] 5 7 fn code_block_box_renders_right_border_in_one_column() { ··· 57 59 ); 58 60 } 59 61 } 62 + 63 + fn plain(lines: &[ratatui::text::Line<'_>]) -> Vec<String> { 64 + lines 65 + .iter() 66 + .map(|l| { 67 + l.spans 68 + .iter() 69 + .map(|s| s.content.as_ref()) 70 + .collect::<String>() 71 + }) 72 + .collect() 73 + } 74 + 75 + #[test] 76 + fn wrap_path_lines_short_path_fits_single_line() { 77 + let s = Style::default(); 78 + let lines = wrap_path_lines("Relative: ", "src/main.rs", 74, s, s); 79 + assert_eq!(lines.len(), 1); 80 + assert_eq!(plain(&lines), vec!["Relative: src/main.rs"]); 81 + } 82 + 83 + #[test] 84 + fn wrap_path_lines_long_path_wraps_with_indent() { 85 + let s = Style::default(); 86 + let label = "Absolute: "; 87 + let path = "a".repeat(80); 88 + let lines = wrap_path_lines(label, &path, 30, s, s); 89 + let text = plain(&lines); 90 + assert!(lines.len() > 1); 91 + assert!(text[0].starts_with("Absolute: ")); 92 + for continuation in &text[1..] { 93 + assert!( 94 + continuation.starts_with(" "), 95 + "continuation should be indented by label width" 96 + ); 97 + } 98 + } 99 + 100 + #[test] 101 + fn wrap_path_lines_continuation_aligned_with_value_start() { 102 + let s = Style::default(); 103 + let label = "Relative: "; 104 + let path = "x".repeat(100); 105 + let lines = wrap_path_lines(label, &path, 40, s, s); 106 + let text = plain(&lines); 107 + let value_width = 40 - label.len(); 108 + assert_eq!(&text[0], &format!("Relative: {}", &path[..value_width])); 109 + assert_eq!( 110 + &text[1], 111 + &format!( 112 + "{}{}", 113 + " ".repeat(label.len()), 114 + &path[value_width..value_width * 2] 115 + ) 116 + ); 117 + } 118 + 119 + #[test] 120 + fn wrap_path_lines_exact_fit_no_wrap() { 121 + let s = Style::default(); 122 + let label = "Test: "; 123 + let path = "x".repeat(74 - label.len()); 124 + let lines = wrap_path_lines(label, &path, 74, s, s); 125 + assert_eq!(lines.len(), 1); 126 + } 127 + 128 + #[test] 129 + fn wrap_path_lines_one_char_over_wraps() { 130 + let s = Style::default(); 131 + let label = "Test: "; 132 + let path = "x".repeat(74 - label.len() + 1); 133 + let lines = wrap_path_lines(label, &path, 74, s, s); 134 + assert_eq!(lines.len(), 2); 135 + }

Configure Feed

Configure Feed