ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-12-01 11:23:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix yank not working with internally zero-width ranges.

Browse Source
This commit is contained in:
Nathan Vegdahl 2021-07-21 09:32:48 -07:00
parent bc85c85501
commit 063aa9452d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-term/src/commands.rs
View File

@ -3000,9 +3000,13 @@ fn redo(cx: &mut Context) {
fn yank(cx: &mut Context) { fn yank(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let text = doc.text().slice(..);
let values: Vec<String> = doc let values: Vec<String> = doc
.selection(view.id) .selection(view.id)
.fragments(doc.text().slice(..)) .clone()
.min_width_1(text)
.fragments(text)
.map(Cow::into_owned) .map(Cow::into_owned)
.collect(); .collect();
@ -3021,10 +3025,13 @@ fn yank(cx: &mut Context) {
fn yank_joined_to_clipboard_impl(editor: &mut Editor, separator: &str) -> anyhow::Result<()> { fn yank_joined_to_clipboard_impl(editor: &mut Editor, separator: &str) -> anyhow::Result<()> {
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let text = doc.text().slice(..);
let values: Vec<String> = doc let values: Vec<String> = doc
.selection(view.id) .selection(view.id)
.fragments(doc.text().slice(..)) .clone()
.min_width_1(text)
.fragments(text)
.map(Cow::into_owned) .map(Cow::into_owned)
.collect(); .collect();
@ -3052,11 +3059,13 @@ fn yank_joined_to_clipboard(cx: &mut Context) {
fn yank_main_selection_to_clipboard_impl(editor: &mut Editor) -> anyhow::Result<()> { fn yank_main_selection_to_clipboard_impl(editor: &mut Editor) -> anyhow::Result<()> {
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let text = doc.text().slice(..);
let value = doc let value = doc
.selection(view.id) .selection(view.id)
.primary() .primary()
.fragment(doc.text().slice(..)); .min_width_1(text)
.fragment(text);
if let Err(e) = editor.clipboard_provider.set_contents(value.into_owned()) { if let Err(e) = editor.clipboard_provider.set_contents(value.into_owned()) {
bail!("Couldn't set system clipboard content: {:?}", e); bail!("Couldn't set system clipboard content: {:?}", e);