0cacf01f90
Before this change code could not distinguish between a user providing a count of 1 and no count at all. Fixes: zed-industries/community#710
49 lines
2.2 KiB
Rust
49 lines
2.2 KiB
Rust
use crate::{motion::Motion, object::Object, utils::copy_selections_content, Vim};
|
|
use collections::HashMap;
|
|
use gpui::WindowContext;
|
|
|
|
pub fn yank_motion(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &mut WindowContext) {
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
editor.transact(cx, |editor, cx| {
|
|
editor.set_clip_at_line_ends(false, cx);
|
|
let mut original_positions: HashMap<_, _> = Default::default();
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let original_position = (selection.head(), selection.goal);
|
|
original_positions.insert(selection.id, original_position);
|
|
motion.expand_selection(map, selection, times, true);
|
|
});
|
|
});
|
|
copy_selections_content(editor, motion.linewise(), cx);
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|_, selection| {
|
|
let (head, goal) = original_positions.remove(&selection.id).unwrap();
|
|
selection.collapse_to(head, goal);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
pub fn yank_object(vim: &mut Vim, object: Object, around: bool, cx: &mut WindowContext) {
|
|
vim.update_active_editor(cx, |editor, cx| {
|
|
editor.transact(cx, |editor, cx| {
|
|
editor.set_clip_at_line_ends(false, cx);
|
|
let mut original_positions: HashMap<_, _> = Default::default();
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|map, selection| {
|
|
let original_position = (selection.head(), selection.goal);
|
|
object.expand_selection(map, selection, around);
|
|
original_positions.insert(selection.id, original_position);
|
|
});
|
|
});
|
|
copy_selections_content(editor, false, cx);
|
|
editor.change_selections(None, cx, |s| {
|
|
s.move_with(|_, selection| {
|
|
let (head, goal) = original_positions.remove(&selection.id).unwrap();
|
|
selection.collapse_to(head, goal);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|