From 21c4dab5f421a9aeb94d324c4625121250427681 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Tue, 4 Mar 2025 18:54:28 -0500 Subject: [PATCH] fix: Some save_prompt_fixes --- src/ui/mod.rs | 6 +++++- src/ui/test.rs | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 7240f63..e18da11 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -332,10 +332,14 @@ impl<'ws> Workspace<'ws> { fn handle_quit_dialog(&mut self, key: event::KeyEvent) -> Result> { if key.kind == KeyEventKind::Press { match key.code { - KeyCode::Esc | KeyCode::Char('n') | KeyCode::Char('N') => return Ok(Some(ExitCode::SUCCESS)), + KeyCode::Esc | KeyCode::Char('n') | KeyCode::Char('N') => { + self.exit_quit_mode()?; + return Ok(Some(ExitCode::SUCCESS)) + }, KeyCode::Char('y') | KeyCode::Char('Y') => { // We have been asked to save the file first. self.save_file()?; + self.exit_quit_mode()?; return Ok(Some(ExitCode::SUCCESS)); }, _ => return Ok(None), diff --git a/src/ui/test.rs b/src/ui/test.rs index f1a36e5..b45166a 100644 --- a/src/ui/test.rs +++ b/src/ui/test.rs @@ -1333,7 +1333,6 @@ fn test_quit_dialog() { .expect("Failed to run input script"); assert!(!result.is_some()); assert_eq!(ws.state.modality(), &Modality::Quit); - assert!(result.is_some()); script() .char('n')