Skip to content

Commit

Permalink
Swap system and primary clipboard registers (helix-editor#8703)
Browse files Browse the repository at this point in the history
  • Loading branch information
Omnikar authored and danillos committed Nov 21, 2023
1 parent 09ceaaa commit 3e92c96
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions helix-view/src/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ impl Registers {
self.clipboard_provider.as_ref(),
self.inner.get(&name),
match name {
'*' => ClipboardType::Clipboard,
'+' => ClipboardType::Selection,
'+' => ClipboardType::Clipboard,
'*' => ClipboardType::Selection,
_ => unreachable!(),
},
)),
Expand All @@ -95,8 +95,8 @@ impl Registers {
self.clipboard_provider.set_contents(
values.join(NATIVE_LINE_ENDING.as_str()),
match name {
'*' => ClipboardType::Clipboard,
'+' => ClipboardType::Selection,
'+' => ClipboardType::Clipboard,
'*' => ClipboardType::Selection,
_ => unreachable!(),
},
)?;
Expand All @@ -118,8 +118,8 @@ impl Registers {
'#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
'*' | '+' => {
let clipboard_type = match name {
'*' => ClipboardType::Clipboard,
'+' => ClipboardType::Selection,
'+' => ClipboardType::Clipboard,
'*' => ClipboardType::Selection,
_ => unreachable!(),
};
let contents = self.clipboard_provider.get_contents(clipboard_type)?;
Expand Down Expand Up @@ -172,8 +172,8 @@ impl Registers {
('#', "<selection indices>"),
('.', "<selection contents>"),
('%', "<document path>"),
('*', "<system clipboard>"),
('+', "<primary clipboard>"),
('+', "<system clipboard>"),
('*', "<primary clipboard>"),
]
.iter()
.copied(),
Expand All @@ -190,8 +190,8 @@ impl Registers {
match name {
'*' | '+' => {
self.clear_clipboard(match name {
'*' => ClipboardType::Clipboard,
'+' => ClipboardType::Selection,
'+' => ClipboardType::Clipboard,
'*' => ClipboardType::Selection,
_ => unreachable!(),
});
self.inner.remove(&name);
Expand Down

0 comments on commit 3e92c96

Please sign in to comment.