andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-23 01:46:18 +04:00
Code Issues Projects Releases Wiki Activity

Deduplicate code

Browse Source
This commit is contained in:
Wojciech Kępka 2021-06-13 11:14:53 +02:00 committed by Blaž Hrastnik
parent 17c9a8499e
commit 52d3c29244
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
helix-term/src/commands.rs
View File

@ -915,15 +915,7 @@ pub struct Command {
fn quit(editor: &mut Editor, args: &[&str], event: PromptEvent) { fn quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {
// last view and we have unsaved changes // last view and we have unsaved changes
if editor.tree.views().count() == 1 { if editor.tree.views().count() == 1 {
let modified = _modified_left(editor); if _buffers_remaining(editor) {
if !modified.is_empty() {
let err = format!(
"{} unsaved buffer(s) remaining: {:?}",
modified.len(),
modified
);
editor.set_error(err);
return; return;
} }
} }
@ -1025,8 +1017,10 @@ fn force_write_quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {
force_quit(editor, &[], event); force_quit(editor, &[], event);
} }
fn _modified_left(editor: &mut Editor) -> Vec<&str> { /// Returns `true` if there are modified buffers remaining and sets editor error,
editor /// otherwise returns `false`
fn _buffers_remaining(editor: &mut Editor) -> bool {
let modified: Vec<_> = editor
.documents() .documents()
.filter(|doc| doc.is_modified()) .filter(|doc| doc.is_modified())
.map(|doc| { .map(|doc| {
@ -1034,7 +1028,18 @@ fn _modified_left(editor: &mut Editor) -> Vec<&str> {
.and_then(|path| path.to_str()) .and_then(|path| path.to_str())
.unwrap_or("[scratch]") .unwrap_or("[scratch]")
}) })
.collect() .collect();
if !modified.is_empty() {
let err = format!(
"{} unsaved buffer(s) remaining: {:?}",
modified.len(),
modified
);
editor.set_error(err);
true
} else {
false
}
} }
fn _write_all(editor: &mut Editor, args: &[&str], event: PromptEvent, quit: bool, force: bool) { fn _write_all(editor: &mut Editor, args: &[&str], event: PromptEvent, quit: bool, force: bool) {
@ -1052,16 +1057,7 @@ fn _write_all(editor: &mut Editor, args: &[&str], event: PromptEvent, quit: bool
if quit { if quit {
if !force { if !force {
// check if there are some unsaved buffers if _buffers_remaining(editor) {
let modified = _modified_left(editor);
if !modified.is_empty() {
let err = format!(
"{} unsaved buffer(s) remaining: {:?}",
modified.len(),
modified
);
editor.set_error(err);
return; return;
} }
} }
@ -1088,15 +1084,7 @@ fn force_write_all_quit(editor: &mut Editor, args: &[&str], event: PromptEvent)
fn _quit_all(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) { fn _quit_all(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) {
if !force { if !force {
// check if there are some unsaved buffers if _buffers_remaining(editor) {
let modified = _modified_left(editor);
if !modified.is_empty() {
let err = format!(
"{} unsaved buffer(s) remaining: {:?}",
modified.len(),
modified
);
editor.set_error(err);
return; return;
} }
} }