Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP making paste better

Browse source
This commit is contained in:
Keith Simmons 2022-07-04 21:10:20 -07:00
parent 58e57d0150
commit ed52f8a8a3
4 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/vim/src/normal.rs
View file

@ -7,6 +7,7 @@ use std::borrow::Cow;
use crate::{
motion::Motion,
state::{Mode, Operator},
utils::copy_selections_content,
Vim,
};
use change::init as change_init;
@ -200,11 +201,12 @@ fn paste(_: &mut Workspace, _: &Paste, cx: &mut ViewContext<Workspace>) {
vim.update_active_editor(cx, |editor, cx| {
editor.transact(cx, |editor, cx| {
if let Some(item) = cx.as_mut().read_from_clipboard() {
copy_selections_content(editor, editor.selections.line_mode, cx);
let mut clipboard_text = Cow::Borrowed(item.text());
if let Some(mut clipboard_selections) =
item.metadata::<Vec<ClipboardSelection>>()
{
let (display_map, selections) = editor.selections.all_display(cx);
let (display_map, selections) = editor.selections.all_adjusted_display(cx);
let all_selections_were_entire_line =
clipboard_selections.iter().all(|s| s.is_entire_line);
if clipboard_selections.len() != selections.len() {

2
crates/vim/src/visual.rs
View file

@ -6,7 +6,7 @@ use workspace::Workspace;
use crate::{motion::Motion, state::Mode, utils::copy_selections_content, Vim};
actions!(vim, [VisualDelete, VisualChange, VisualYank]);
actions!(vim, [VisualDelete, VisualChange, VisualYank, VisualPaste]);
pub fn init(cx: &mut MutableAppContext) {
cx.add_action(change);