10c77cd · helix · git.iko.soy

on master help sign in

Exit extend after yank

10c77cdIvan Tham5 years ago

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

@@ -3200,7 +3200,8 @@ fn yank(cx: &mut Context) {

3200 .registers

3201 .write(cx.selected_register.name(), values);

3202

3203− cx.editor.set_status(msg)

3203+ cx.editor.set_status(msg);

3204+ exit_select_mode(cx);

3204}

3205}

3205

3206

3206fn yank_joined_to_clipboard_impl(editor: &mut Editor, separator: &str) -> anyhow::Result<()> {

3207fn yank_joined_to_clipboard_impl(editor: &mut Editor, separator: &str) -> anyhow::Result<()> {

@@ -3233,6 +3234,7 @@ fn yank_joined_to_clipboard_impl(editor: &mut Editor, separator: &str) -> anyhow

3233fn yank_joined_to_clipboard(cx: &mut Context) {

3234fn yank_joined_to_clipboard(cx: &mut Context) {

3234 let line_ending = current!(cx.editor).1.line_ending;

3235 let line_ending = current!(cx.editor).1.line_ending;

3235 let _ = yank_joined_to_clipboard_impl(&mut cx.editor, line_ending.as_str());

3236 let _ = yank_joined_to_clipboard_impl(&mut cx.editor, line_ending.as_str());

3237+ exit_select_mode(cx);

3236}

3238}

3237

3239

3238fn yank_main_selection_to_clipboard_impl(editor: &mut Editor) -> anyhow::Result<()> {

3240fn yank_main_selection_to_clipboard_impl(editor: &mut Editor) -> anyhow::Result<()> {

@@ -3251,6 +3253,7 @@ fn yank_main_selection_to_clipboard_impl(editor: &mut Editor) -> anyhow::Result<

3251

3253

3252fn yank_main_selection_to_clipboard(cx: &mut Context) {

3254fn yank_main_selection_to_clipboard(cx: &mut Context) {

3253 let _ = yank_main_selection_to_clipboard_impl(&mut cx.editor);

3255 let _ = yank_main_selection_to_clipboard_impl(&mut cx.editor);

3256+ exit_select_mode(cx);

3254}

3257}

3255

3258

3256#[derive(Copy, Clone)]

3259#[derive(Copy, Clone)]