3505352 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

always commit to history when pasting (#5790)

3505352Pascal Kuthe4 years ago

helix-term/src/commands.rs+1

compare with master

unifiedsplit

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

3746 }

3747

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

3749+ doc.append_changes_to_history(view);

3749}

3750}

3750

3751

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

3752pub(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(

913 cx: &mut compositor::Context,

914 clipboard_type: ClipboardType,

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

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

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

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

917

918

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

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

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

924

925

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

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

926 doc.append_changes_to_history(view);

927 doc.append_changes_to_history(view);

928+ view.ensure_cursor_in_view(doc, scrolloff);

927 Ok(())

929 Ok(())

928 }

930 }

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

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

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

1570 _args: &[Cow<str>],

1572 _args: &[Cow<str>],

1571 reverse: bool,

1573 reverse: bool,

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

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

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

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

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

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

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

1575

1578

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

1595

1598

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

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

1597 doc.append_changes_to_history(view);

1600 doc.append_changes_to_history(view);

1601+ view.ensure_cursor_in_view(doc, scrolloff);

1598

1602

1599 Ok(())

1603 Ok(())

1600}

1604}