3505352 · helix · git.iko.soy

git.iko.soy/helix

always commit to history when pasting (#5790)

commit350535208f134f1d8a6201833ad560905fea5abc authorPascal Kuthe <pascal.kuthe@semimod.de> dateThu 2 Feb 2023, 20:56 (4 years ago) parenta5233cf

2 files changed+5

compare with master

unifiedsplit

helix-term/src/commands.rs+1 helix-term/src/commands/typed.rs+4

helix-term/src/commands.rs+1

@@ -3746,6 +3746,7 @@ fn paste_impl(

37463746 }

37473747

37483748 doc.apply(&transaction, view.id);

3749+ doc.append_changes_to_history(view);

37493750}

37503751

37513752pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {

helix-term/src/commands/typed.rs+4

@@ -913,6 +913,7 @@ fn replace_selections_with_clipboard_impl(

913913 cx: &mut compositor::Context,

914914 clipboard_type: ClipboardType,

915915) -> anyhow::Result<()> {

916+ let scrolloff = cx.editor.config().scrolloff;

916917 let (view, doc) = current!(cx.editor);

917918

918919 match cx.editor.clipboard_provider.get_contents(clipboard_type) {

@@ -924,6 +925,7 @@ fn replace_selections_with_clipboard_impl(

924925

925926 doc.apply(&transaction, view.id);

926927 doc.append_changes_to_history(view);

928+ view.ensure_cursor_in_view(doc, scrolloff);

927929 Ok(())

928930 }

929931 Err(e) => Err(e.context("Couldn't get system clipboard contents")),

@@ -1570,6 +1572,7 @@ fn sort_impl(

15701572 _args: &[Cow<str>],

15711573 reverse: bool,

15721574) -> anyhow::Result<()> {

1575+ let scrolloff = cx.editor.config().scrolloff;

15731576 let (view, doc) = current!(cx.editor);

15741577 let text = doc.text().slice(..);

15751578

@@ -1595,6 +1598,7 @@ fn sort_impl(

15951598

15961599 doc.apply(&transaction, view.id);

15971600 doc.append_changes_to_history(view);

1601+ view.ensure_cursor_in_view(doc, scrolloff);

15981602

15991603 Ok(())

16001604}