Skip to content

Commit

Permalink
Add :cquit! command and prevent :cquit from ignoring unsaved chan…
Browse files Browse the repository at this point in the history
…ges (#1414)

* Add `:cquit!` command and prevent `:cquit` from ignoring unsaved changes

* `cargo xtask docgen`
  • Loading branch information
Omnikar authored Jan 3, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent ea095ca commit ed97ecc
Showing 2 changed files with 29 additions and 17 deletions.
1 change: 1 addition & 0 deletions book/src/generated/typable-cmd.md
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
| `:quit-all`, `:qa` | Close all views. |
| `:quit-all!`, `:qa!` | Close all views forcefully (ignoring unsaved changes). |
| `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
| `:cquit!`, `:cq!` | Quit with exit code (default 1) forcefully (ignoring unsaved changes). Accepts an optional integer exit code (:cq! 2). |
| `:theme` | Change the editor theme. |
| `:clipboard-yank` | Yank main selection into system clipboard. |
| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
45 changes: 28 additions & 17 deletions helix-term/src/commands.rs
Original file line number Diff line number Diff line change
@@ -2322,12 +2322,7 @@ pub mod cmd {
write_all_impl(cx, args, event, true, true)
}

fn quit_all_impl(
editor: &mut Editor,
_args: &[Cow<str>],
_event: PromptEvent,
force: bool,
) -> anyhow::Result<()> {
fn quit_all_impl(editor: &mut Editor, force: bool) -> anyhow::Result<()> {
if !force {
buffers_remaining_impl(editor)?;
}
@@ -2343,18 +2338,18 @@ pub mod cmd {

fn quit_all(
cx: &mut compositor::Context,
args: &[Cow<str>],
event: PromptEvent,
_args: &[Cow<str>],
_event: PromptEvent,
) -> anyhow::Result<()> {
quit_all_impl(cx.editor, args, event, false)
quit_all_impl(cx.editor, false)
}

fn force_quit_all(
cx: &mut compositor::Context,
args: &[Cow<str>],
event: PromptEvent,
_args: &[Cow<str>],
_event: PromptEvent,
) -> anyhow::Result<()> {
quit_all_impl(cx.editor, args, event, true)
quit_all_impl(cx.editor, true)
}

fn cquit(
@@ -2368,12 +2363,21 @@ pub mod cmd {
.unwrap_or(1);
cx.editor.exit_code = exit_code;

let views: Vec<_> = cx.editor.tree.views().map(|(view, _)| view.id).collect();
for view_id in views {
cx.editor.close(view_id);
}
quit_all_impl(cx.editor, false)
}

Ok(())
fn force_cquit(
cx: &mut compositor::Context,
args: &[Cow<str>],
_event: PromptEvent,
) -> anyhow::Result<()> {
let exit_code = args
.first()
.and_then(|code| code.parse::<i32>().ok())
.unwrap_or(1);
cx.editor.exit_code = exit_code;

quit_all_impl(cx.editor, true)
}

fn theme(
@@ -2877,6 +2881,13 @@ pub mod cmd {
fun: cquit,
completer: None,
},
TypableCommand {
name: "cquit!",
aliases: &["cq!"],
doc: "Quit with exit code (default 1) forcefully (ignoring unsaved changes). Accepts an optional integer exit code (:cq! 2).",
fun: force_cquit,
completer: None,
},
TypableCommand {
name: "theme",
aliases: &[],

0 comments on commit ed97ecc

Please sign in to comment.