Fix behavior when closing with unsaved changes

"n" and "esc" were previously handled the same as "go back to editing",
instead of "n" meaning exit editor but don't save changes.

Signed-off-by: Martin Prpič <martin.prpic@gmail.com>

Author: mprpic

src/commit_editor/app.py

@@ -304,13 +304,21 @@ def check_action(self, action: str, parameters: tuple) -> bool | None:
         """Disable editor actions when in prompt mode."""
         if self._prompt_mode is not None:
             # Allow only prompt-related actions
-            if action in ("confirm_quit", "cancel_quit"):
+            if action in ("confirm_quit", "discard_quit", "cancel_quit"):
                 return True
             return False
         return True
 
     def action_confirm_quit(self) -> None:
-        """Confirm quit when prompted."""
+        """Save and quit when prompted."""
+        if self._prompt_mode == "quit_confirm":
+            self._prompt_mode = None
+            self.query_one("#message", MessageBar).clear()
+            self.action_save()
+            self.exit()
+
+    def action_discard_quit(self) -> None:
+        """Quit without saving when prompted."""
         if self._prompt_mode == "quit_confirm":
             self._prompt_mode = None
             self.query_one("#message", MessageBar).clear()
@@ -332,7 +340,11 @@ def on_key(self, event) -> None:
                 event.prevent_default()
                 event.stop()
                 self.action_confirm_quit()
-            elif event.key in ("n", "escape"):
+            elif event.key == "n":
+                event.prevent_default()
+                event.stop()
+                self.action_discard_quit()
+            elif event.key == "escape":
                 event.prevent_default()
                 event.stop()
                 self.action_cancel_quit()
@@ -398,7 +410,7 @@ def action_quit_app(self) -> None:
             editor = self.query_one("#editor", CommitTextArea)
             editor.read_only = True
             message_bar = self.query_one("#message", MessageBar)
-            message_bar.show_prompt("Unsaved changes. Quit anyway? (y,n,esc)")
+            message_bar.show_prompt("Save changes? (y/n/esc)")
         else:
             self.exit()
 

tests/test_app.py

@@ -88,10 +88,10 @@ async def test_ctrl_q_dirty_shows_prompt(self, temp_file):
             assert app._prompt_mode == "quit_confirm"
             message_bar = app.query_one("#message", MessageBar)
             message_content = message_bar.message
-            assert "Quit anyway?" in message_content
+            assert "Save changes?" in message_content
 
-    async def test_confirm_quit_with_y(self, temp_file):
-        """Pressing 'y' in confirmation prompt should quit."""
+    async def test_confirm_quit_with_y_saves_and_exits(self, temp_file):
+        """Pressing 'y' in confirmation prompt should save and quit."""
         temp_file.write_text("Original")
         app = CommitEditorApp(temp_file)
 
@@ -104,9 +104,11 @@ async def test_confirm_quit_with_y(self, temp_file):
             await pilot.press("y")
 
             assert app._exit is True
+            # File should have been saved with the modified content
+            assert temp_file.read_text() == "Modified\n"
 
-    async def test_cancel_quit_with_n(self, temp_file):
-        """Pressing 'n' in confirmation prompt should cancel quit."""
+    async def test_discard_quit_with_n(self, temp_file):
+        """Pressing 'n' in confirmation prompt should quit without saving."""
         temp_file.write_text("Original")
         app = CommitEditorApp(temp_file)
 
@@ -118,13 +120,9 @@ async def test_cancel_quit_with_n(self, temp_file):
             await pilot.press("ctrl+q")
             await pilot.press("n")
 
-            # Should not have exited, prompt mode should be cleared
-            assert app._exit is False
-            assert app._prompt_mode is None
-            message_bar = app.query_one("#message", MessageBar)
-            # Message bar should be cleared (empty)
-            message_content = message_bar.message
-            assert message_content == ""
+            # Should have exited without saving
+            assert app._exit is True
+            assert temp_file.read_text() == "Original"
 
     async def test_cancel_quit_with_escape(self, temp_file):
         """Pressing 'escape' in confirmation prompt should cancel quit."""