Mirrors
/
helix
mirror of https://github.com/helix-editor/helix
1
1
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Append changes to history before & after each command

Browse Source 
Related to <https://redirect.github.com/helix-editor/helix/pull/7226>
append-changes-ensure-cursor-automatically
Michael Davis 9 months ago
parent 50c90cb47c
commit faf0cdebc1
No known key found for this signature in database
3 changed files with 70 additions and 110 deletions
Show Stats Download Patch File Download Diff File

92
helix-term/src/commands.rs
Unescape Escape View File

@ -59,7 +59,7 @@ use movement::Movement;
use crate::{ use crate::{
args, args,
compositor::{self, Component, Compositor}, compositor::{self, Component, Compositor},
filter_picker_entry, events, filter_picker_entry,
job::Callback, job::Callback,
keymap::ReverseKeymap, keymap::ReverseKeymap,
ui::{self, menu::Item, overlay::overlaid, Picker, Popup, Prompt, PromptEvent}, ui::{self, menu::Item, overlay::overlaid, Picker, Popup, Prompt, PromptEvent},
@ -142,6 +142,45 @@ impl<'a> Context<'a> {
pub fn count(&self) -> usize { pub fn count(&self) -> usize {
self.count.map_or(1, |v| v.get()) self.count.map_or(1, |v| v.get())
} }
pub fn execute<F: FnOnce(&mut Self)>(&mut self, execute_fn: F) {
self.execute_impl(execute_fn)
}
pub fn execute_command(&mut self, command: &MappableCommand) {
self.execute_impl(|cx| {
command.execute(cx);
helix_event::dispatch(events::PostCommand { command, cx });
})
}
fn execute_impl<F: FnOnce(&mut Self)>(&mut self, execute_fn: F) {
let pre_command_mode = self.editor.mode();
if pre_command_mode != Mode::Insert {
let (view, doc) = current!(self.editor);
doc.append_changes_to_history(view);
}
execute_fn(self);
let post_command_mode = self.editor.mode();
if post_command_mode != pre_command_mode {
helix_event::dispatch(events::OnModeSwitch {
old_mode: pre_command_mode,
new_mode: post_command_mode,
cx: self,
});
}
if !self.editor.tree.is_empty() {
let scrolloff = self.editor.config().scrolloff;
let (view, doc) = current!(self.editor);
if post_command_mode != Mode::Insert {
doc.append_changes_to_history(view);
}
view.ensure_cursor_in_view(doc, scrolloff);
}
}
} }
#[inline] #[inline]
@ -1981,7 +2020,6 @@ fn search_impl(
regex: &rope::Regex, regex: &rope::Regex,
movement: Movement, movement: Movement,
direction: Direction, direction: Direction,
scrolloff: usize,
wrap_around: bool, wrap_around: bool,
show_warnings: bool, show_warnings: bool,
) { ) {
@ -2054,7 +2092,6 @@ fn search_impl(
}; };
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
view.ensure_cursor_in_view_center(doc, scrolloff);
}; };
} }
@ -2078,7 +2115,6 @@ fn rsearch(cx: &mut Context) {
fn searcher(cx: &mut Context, direction: Direction) { fn searcher(cx: &mut Context, direction: Direction) {
let reg = cx.register.unwrap_or('/'); let reg = cx.register.unwrap_or('/');
let config = cx.editor.config(); let config = cx.editor.config();
let scrolloff = config.scrolloff;
let wrap_around = config.search.wrap_around; let wrap_around = config.search.wrap_around;
let movement = if cx.editor.mode() == Mode::Select { let movement = if cx.editor.mode() == Mode::Select {
Movement::Extend Movement::Extend
@ -2106,15 +2142,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
} else if event != PromptEvent::Update { } else if event != PromptEvent::Update {
return; return;
} }
search_impl( search_impl(cx.editor, &regex, movement, direction, wrap_around, false);
cx.editor,
&regex,
movement,
direction,
scrolloff,
wrap_around,
false,
);
}, },
); );
} }
@ -2125,7 +2153,6 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
.register .register
.unwrap_or(cx.editor.registers.last_search_register); .unwrap_or(cx.editor.registers.last_search_register);
let config = cx.editor.config(); let config = cx.editor.config();
let scrolloff = config.scrolloff;
if let Some(query) = cx.editor.registers.first(register, cx.editor) { if let Some(query) = cx.editor.registers.first(register, cx.editor) {
let search_config = &config.search; let search_config = &config.search;
let case_insensitive = if search_config.smart_case { let case_insensitive = if search_config.smart_case {
@ -2143,15 +2170,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
.build(&query) .build(&query)
{ {
for _ in 0..count { for _ in 0..count {
search_impl( search_impl(cx.editor, &regex, movement, direction, wrap_around, true);
cx.editor,
&regex,
movement,
direction,
scrolloff,
wrap_around,
true,
);
} }
} else { } else {
let error = format!("Invalid regex: {}", query); let error = format!("Invalid regex: {}", query);
@ -3188,22 +3207,8 @@ pub fn command_palette(cx: &mut Context) {
on_next_key_callback: None, on_next_key_callback: None,
jobs: cx.jobs, jobs: cx.jobs,
}; };
let focus = view!(ctx.editor).id;
command.execute(&mut ctx);
if ctx.editor.tree.contains(focus) {
let config = ctx.editor.config();
let mode = ctx.editor.mode();
let view = view_mut!(ctx.editor, focus);
let doc = doc_mut!(ctx.editor, &view.doc);
view.ensure_cursor_in_view(doc, config.scrolloff); ctx.execute_command(command);
if mode != Mode::Insert {
doc.append_changes_to_history(view);
}
}
}); });
compositor.push(Box::new(overlaid(picker))); compositor.push(Box::new(overlaid(picker)));
}, },
@ -4329,7 +4334,6 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
return; return;
}; };
let values: Vec<_> = values.map(|value| value.to_string()).collect(); let values: Vec<_> = values.map(|value| value.to_string()).collect();
let scrolloff = editor.config().scrolloff;
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let repeat = std::iter::repeat( let repeat = std::iter::repeat(
@ -4352,8 +4356,6 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
}); });
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
} }
fn replace_selections_with_clipboard(cx: &mut Context) { fn replace_selections_with_clipboard(cx: &mut Context) {
@ -5037,7 +5039,6 @@ fn match_brackets(cx: &mut Context) {
fn jump_forward(cx: &mut Context) { fn jump_forward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let config = cx.editor.config();
let view = view_mut!(cx.editor); let view = view_mut!(cx.editor);
let doc_id = view.doc; let doc_id = view.doc;
@ -5051,13 +5052,11 @@ fn jump_forward(cx: &mut Context) {
} }
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
view.ensure_cursor_in_view_center(doc, config.scrolloff);
}; };
} }
fn jump_backward(cx: &mut Context) { fn jump_backward(cx: &mut Context) {
let count = cx.count(); let count = cx.count();
let config = cx.editor.config();
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let doc_id = doc.id(); let doc_id = doc.id();
@ -5071,7 +5070,6 @@ fn jump_backward(cx: &mut Context) {
} }
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
view.ensure_cursor_in_view_center(doc, config.scrolloff);
}; };
} }
@ -5789,10 +5787,6 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
doc.append_changes_to_history(view); doc.append_changes_to_history(view);
} }
// after replace cursor may be out of bounds, do this to
// make sure cursor is in view and update scroll as well
view.ensure_cursor_in_view(doc, config.scrolloff);
} }
fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBehavior) { fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBehavior) {

25
helix-term/src/commands/typed.rs
Unescape Escape View File

@ -1269,11 +1269,8 @@ fn reload(
return Ok(()); return Ok(());
} }
let scrolloff = cx.editor.config().scrolloff;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
doc.reload(view, &cx.editor.diff_providers).map(|_| { doc.reload(view, &cx.editor.diff_providers)?;
view.ensure_cursor_in_view(doc, scrolloff);
})?;
if let Some(path) = doc.path() { if let Some(path) = doc.path() {
cx.editor cx.editor
.language_servers .language_servers
@ -2029,7 +2026,6 @@ fn sort_impl(
_args: &[Cow<str>], _args: &[Cow<str>],
reverse: bool, reverse: bool,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let scrolloff = cx.editor.config().scrolloff;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..); let text = doc.text().slice(..);
@ -2054,8 +2050,6 @@ fn sort_impl(
); );
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
Ok(()) Ok(())
} }
@ -2069,7 +2063,6 @@ fn reflow(
return Ok(()); return Ok(());
} }
let scrolloff = cx.editor.config().scrolloff;
let cfg_text_width: usize = cx.editor.config().text_width; let cfg_text_width: usize = cx.editor.config().text_width;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
@ -2095,8 +2088,6 @@ fn reflow(
}); });
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
Ok(()) Ok(())
} }
@ -2296,7 +2287,6 @@ fn reset_diff_change(
ensure!(args.is_empty(), ":reset-diff-change takes no arguments"); ensure!(args.is_empty(), ":reset-diff-change takes no arguments");
let editor = &mut cx.editor; let editor = &mut cx.editor;
let scrolloff = editor.config().scrolloff;
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let Some(handle) = doc.diff_handle() else { let Some(handle) = doc.diff_handle() else {
@ -2334,8 +2324,6 @@ fn reset_diff_change(
// select inserted text // select inserted text
let text_len = before_end - before_start; let text_len = before_end - before_start;
doc.set_selection(view.id, Selection::single(anchor, anchor + text_len)); doc.set_selection(view.id, Selection::single(anchor, anchor + text_len));
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
Ok(()) Ok(())
} }
@ -2460,7 +2448,6 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
return Ok(()); return Ok(());
} }
let scrolloff = cx.editor.config().scrolloff;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
ensure!(!args.is_empty(), "file name is expected"); ensure!(!args.is_empty(), "file name is expected");
@ -2482,8 +2469,6 @@ fn read(cx: &mut compositor::Context, args: &[Cow<str>], event: PromptEvent) ->
let selection = doc.selection(view.id); let selection = doc.selection(view.id);
let transaction = Transaction::insert(doc.text(), selection, contents); let transaction = Transaction::insert(doc.text(), selection, contents);
doc.apply(&transaction, view.id); doc.apply(&transaction, view.id);
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
Ok(()) Ok(())
} }
@ -3190,9 +3175,17 @@ pub(super) fn command_mode(cx: &mut Context) {
let shellwords = Shellwords::from(input); let shellwords = Shellwords::from(input);
let args = shellwords.words(); let args = shellwords.words();
let (view, doc) = current!(cx.editor);
doc.append_changes_to_history(view);
if let Err(e) = (cmd.fun)(cx, &args[1..], event) { if let Err(e) = (cmd.fun)(cx, &args[1..], event) {
cx.editor.set_error(format!("{}", e)); cx.editor.set_error(format!("{}", e));
} }
if !cx.editor.tree.is_empty() {
let scrolloff = cx.editor.config().scrolloff;
let (view, doc) = current!(cx.editor);
doc.append_changes_to_history(view);
view.ensure_cursor_in_view(doc, scrolloff);
}
} else if event == PromptEvent::Validate { } else if event == PromptEvent::Validate {
cx.editor cx.editor
.set_error(format!("no such command: '{}'", parts[0])); .set_error(format!("no such command: '{}'", parts[0]));

63
helix-term/src/ui/editor.rs
Unescape Escape View File

@ -1,7 +1,6 @@
use crate::{ use crate::{
commands::{self, OnKeyCallback}, commands::{self, OnKeyCallback},
compositor::{Component, Context, Event, EventResult}, compositor::{Component, Context, Event, EventResult},
events::{OnModeSwitch, PostCommand},
key, key,
keymap::{KeymapResult, Keymaps}, keymap::{KeymapResult, Keymaps},
ui::{ ui::{
@ -867,17 +866,10 @@ impl EditorView {
cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox()); cxt.editor.autoinfo = self.keymaps.sticky().map(|node| node.infobox());
let mut execute_command = |command: &commands::MappableCommand| { let mut execute_command = |command: &commands::MappableCommand| {
command.execute(cxt); cxt.execute_command(command);
helix_event::dispatch(PostCommand { command, cx: cxt });
let current_mode = cxt.editor.mode(); let current_mode = cxt.editor.mode();
if current_mode != last_mode { if current_mode != last_mode {
helix_event::dispatch(OnModeSwitch {
old_mode: last_mode,
new_mode: current_mode,
cx: cxt,
});
// HAXX: if we just entered insert mode from normal, clear key buf // HAXX: if we just entered insert mode from normal, clear key buf
// and record the command that got us into this mode. // and record the command that got us into this mode.
if current_mode == Mode::Insert { if current_mode == Mode::Insert {
@ -887,7 +879,6 @@ impl EditorView {
self.last_insert.1.clear(); self.last_insert.1.clear();
} }
} }
last_mode = current_mode; last_mode = current_mode;
}; };
@ -911,18 +902,18 @@ impl EditorView {
match keyresult { match keyresult {
KeymapResult::NotFound => { KeymapResult::NotFound => {
if let Some(ch) = event.char() { if let Some(ch) = event.char() {
commands::insert::insert_char(cx, ch) cx.execute(|cx| commands::insert::insert_char(cx, ch))
} }
} }
KeymapResult::Cancelled(pending) => { KeymapResult::Cancelled(pending) => {
for ev in pending { for ev in pending {
match ev.char() { match ev.char() {
Some(ch) => commands::insert::insert_char(cx, ch), Some(ch) => cx.execute(|cx| commands::insert::insert_char(cx, ch)),
None => { None => {
if let KeymapResult::Matched(command) = if let KeymapResult::Matched(command) =
self.keymaps.get(Mode::Insert, ev) self.keymaps.get(Mode::Insert, ev)
{ {
command.execute(cx); cx.execute_command(&command);
} }
} }
} }
@ -949,7 +940,7 @@ impl EditorView {
(key!('.'), _) if self.keymaps.pending().is_empty() => { (key!('.'), _) if self.keymaps.pending().is_empty() => {
for _ in 0..cxt.editor.count.map_or(1, NonZeroUsize::into) { for _ in 0..cxt.editor.count.map_or(1, NonZeroUsize::into) {
// first execute whatever put us into insert mode // first execute whatever put us into insert mode
self.last_insert.0.execute(cxt); cxt.execute_command(&self.last_insert.0);
let mut last_savepoint = None; let mut last_savepoint = None;
let mut last_request_savepoint = None; let mut last_request_savepoint = None;
// then replay the inputs // then replay the inputs
@ -1240,8 +1231,9 @@ impl EditorView {
}; };
if should_yank { if should_yank {
commands::MappableCommand::yank_main_selection_to_primary_clipboard cxt.execute_command(
.execute(cxt); &commands::MappableCommand::yank_main_selection_to_primary_clipboard,
);
EventResult::Consumed(None) EventResult::Consumed(None)
} else { } else {
EventResult::Ignored(None) EventResult::Ignored(None)
@ -1261,9 +1253,11 @@ impl EditorView {
doc.set_selection(view_id, Selection::point(pos)); doc.set_selection(view_id, Selection::point(pos));
match modifiers { match modifiers {
KeyModifiers::ALT => { KeyModifiers::ALT => {
commands::MappableCommand::dap_edit_log.execute(cxt) cxt.execute_command(&commands::MappableCommand::dap_edit_log)
} }
_ => commands::MappableCommand::dap_edit_condition.execute(cxt), _ => cxt.execute_command(
&commands::MappableCommand::dap_edit_condition,
),
}; };
} }
} }
@ -1281,8 +1275,9 @@ impl EditorView {
} }
if modifiers == KeyModifiers::ALT { if modifiers == KeyModifiers::ALT {
commands::MappableCommand::replace_selections_with_primary_clipboard cxt.execute_command(
.execute(cxt); &commands::MappableCommand::replace_selections_with_primary_clipboard,
);
return EventResult::Consumed(None); return EventResult::Consumed(None);
} }
@ -1291,7 +1286,7 @@ impl EditorView {
let doc = doc_mut!(editor, &view!(editor, view_id).doc); let doc = doc_mut!(editor, &view!(editor, view_id).doc);
doc.set_selection(view_id, Selection::point(pos)); doc.set_selection(view_id, Selection::point(pos));
cxt.editor.focus(view_id); cxt.editor.focus(view_id);
commands::MappableCommand::paste_primary_clipboard_before.execute(cxt); cxt.execute_command(&commands::MappableCommand::paste_primary_clipboard_before);
return EventResult::Consumed(None); return EventResult::Consumed(None);
} }
@ -1323,20 +1318,9 @@ impl Component for EditorView {
Event::Paste(contents) => { Event::Paste(contents) => {
self.handle_non_key_input(&mut cx); self.handle_non_key_input(&mut cx);
cx.count = cx.editor.count; cx.count = cx.editor.count;
commands::paste_bracketed_value(&mut cx, contents.clone()); cx.execute(|cx| commands::paste_bracketed_value(cx, contents.clone()));
cx.editor.count = None; cx.editor.count = None;
let config = cx.editor.config();
let mode = cx.editor.mode();
let (view, doc) = current!(cx.editor);
view.ensure_cursor_in_view(doc, config.scrolloff);
// Store a history state if not in insert mode. Otherwise wait till we exit insert
// to include any edits to the paste in the history state.
if mode != Mode::Insert {
doc.append_changes_to_history(view);
}
EventResult::Consumed(None) EventResult::Consumed(None)
} }
Event::Resize(_width, _height) => { Event::Resize(_width, _height) => {
@ -1355,7 +1339,7 @@ impl Component for EditorView {
if let Some(on_next_key) = self.on_next_key.take() { if let Some(on_next_key) = self.on_next_key.take() {
// if there's a command waiting input, do that first // if there's a command waiting input, do that first
on_next_key(&mut cx, key); cx.execute(|cx| on_next_key(cx, key));
} else { } else {
match mode { match mode {
Mode::Insert => { Mode::Insert => {
@ -1419,17 +1403,6 @@ impl Component for EditorView {
return EventResult::Ignored(None); return EventResult::Ignored(None);
} }
let config = cx.editor.config();
let mode = cx.editor.mode();
let (view, doc) = current!(cx.editor);
view.ensure_cursor_in_view(doc, config.scrolloff);
// Store a history state if not in insert mode. This also takes care of
// committing changes when leaving insert mode.
if mode != Mode::Insert {
doc.append_changes_to_history(view);
}
let callback = if callbacks.is_empty() { let callback = if callbacks.is_empty() {
None None
} else { } else {

Write Preview
Loading…
Cancel
Save