fix: Don't allow closing the last split if there's unsaved changes

Fixes #674
pull/766/head
Blaž Hrastnik 3 years ago
parent c7d6e4461f
commit 3ff5b001ac

@ -1568,7 +1568,7 @@ mod cmd {
/// Results an error if there are modified buffers remaining and sets editor error, /// Results an error if there are modified buffers remaining and sets editor error,
/// otherwise returns `Ok(())` /// otherwise returns `Ok(())`
fn buffers_remaining_impl(editor: &mut Editor) -> anyhow::Result<()> { pub(super) fn buffers_remaining_impl(editor: &mut Editor) -> anyhow::Result<()> {
let modified: Vec<_> = editor let modified: Vec<_> = editor
.documents() .documents()
.filter(|doc| doc.is_modified()) .filter(|doc| doc.is_modified())
@ -4157,6 +4157,12 @@ fn vsplit(cx: &mut Context) {
} }
fn wclose(cx: &mut Context) { fn wclose(cx: &mut Context) {
if cx.editor.tree.views().count() == 1 {
if let Err(err) = cmd::buffers_remaining_impl(cx.editor) {
cx.editor.set_error(err.to_string());
return;
}
}
let view_id = view!(cx.editor).id; let view_id = view!(cx.editor).id;
// close current split // close current split
cx.editor.close(view_id, /* close_buffer */ false); cx.editor.close(view_id, /* close_buffer */ false);

Loading…
Cancel
Save