e80beaa · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Changed Selection Yank Message (#4275)

e80beaaNathaniel Graham4 years ago

helix-term/src/commands.rs+13−2

compare with master

unifiedsplit

@@ -3345,9 +3345,15 @@ fn yank_joined_to_clipboard_impl(

3345 .map(Cow::into_owned)

3346 .collect();

3347

3348+ let clipboard_text = match clipboard_type {

3349+ ClipboardType::Clipboard => "system clipboard",

3350+ ClipboardType::Selection => "primary clipboard",

3351+ };

3352+

3348 let msg = format!(

3353 let msg = format!(

3349− "joined and yanked {} selection(s) to system clipboard",

3354+ "joined and yanked {} selection(s) to {}",

3350 values.len(),

3355 values.len(),

3356+ clipboard_text,

3351 );

3357 );

3352

3358

3353 let joined = values.join(separator);

3359 let joined = values.join(separator);

@@ -3376,6 +3382,11 @@ fn yank_main_selection_to_clipboard_impl(

3376 let (view, doc) = current!(editor);

3382 let (view, doc) = current!(editor);

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

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

3378

3384

3385+ let message_text = match clipboard_type {

3386+ ClipboardType::Clipboard => "yanked main selection to system clipboard",

3387+ ClipboardType::Selection => "yanked main selection to primary clipboard",

3388+ };

3389+

3379 let value = doc.selection(view.id).primary().fragment(text);

3390 let value = doc.selection(view.id).primary().fragment(text);

3380

3391

3381 if let Err(e) = editor

3392 if let Err(e) = editor

@@ -3385,7 +3396,7 @@ fn yank_main_selection_to_clipboard_impl(

3385 bail!("Couldn't set system clipboard content: {}", e);

3396 bail!("Couldn't set system clipboard content: {}", e);

3386 }

3397 }

3387

3398

3388− editor.set_status("yanked main selection to system clipboard");

3399+ editor.set_status(message_text);

3389 Ok(())

3400 Ok(())

3390}

3401}

3391

3402