zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

vim: Add :y (#17448)

Browse Source 
Closes #16937
Updates #17397

Release Notes:

- vim: Add `:y[ank]`
This commit is contained in:
Conrad Irwin 2024-09-05 19:45:18 -06:00 committed by GitHub
parent 30f70ff110
commit fb35cd98c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/vim/src/command.rs
View File

@ -21,7 +21,7 @@ use crate::{
JoinLines,
},
state::Mode,
visual::VisualDeleteLine,
visual::{VisualDeleteLine, VisualYankLine},
Vim,
};
@ -587,6 +587,7 @@ fn generate_commands(_: &AppContext) -> Vec<VimCommand> {
VimCommand::new(("lN", "ext"), editor::actions::GoToPrevDiagnostic).count(),
VimCommand::new(("j", "oin"), JoinLines).range(),
VimCommand::new(("d", "elete"), VisualDeleteLine).range(),
VimCommand::new(("y", "ank"), VisualYankLine).range(),
VimCommand::new(("sor", "t"), SortLinesCaseSensitive).range(),
VimCommand::new(("sort i", ""), SortLinesCaseInsensitive).range(),
VimCommand::str(("E", "xplore"), "project_panel::ToggleFocus"),

15
crates/vim/src/visual.rs
View File

@ -30,6 +30,7 @@ actions!(
VisualDelete,
VisualDeleteLine,
VisualYank,
VisualYankLine,
OtherEnd,
SelectNext,
SelectPrevious,
@ -58,7 +59,12 @@ pub fn register(editor: &mut Editor, cx: &mut ViewContext<Vim>) {
vim.record_current_action(cx);
vim.visual_delete(true, cx);
});
Vim::action(editor, cx, |vim, _: &VisualYank, cx| vim.visual_yank(cx));
Vim::action(editor, cx, |vim, _: &VisualYank, cx| {
vim.visual_yank(false, cx)
});
Vim::action(editor, cx, |vim, _: &VisualYankLine, cx| {
vim.visual_yank(true, cx)
});
Vim::action(editor, cx, Vim::select_next);
Vim::action(editor, cx, Vim::select_previous);
@ -440,10 +446,11 @@ impl Vim {
self.switch_mode(Mode::Normal, true, cx);
}
pub fn visual_yank(&mut self, cx: &mut ViewContext<Self>) {
pub fn visual_yank(&mut self, line_mode: bool, cx: &mut ViewContext<Self>) {
self.store_visual_marks(cx);
self.update_editor(cx, |vim, editor, cx| {
let line_mode = editor.selections.line_mode;
let line_mode = line_mode || editor.selections.line_mode;
editor.selections.line_mode = line_mode;
vim.yank_selections_content(editor, line_mode, cx);
editor.change_selections(None, cx, |s| {
s.move_with(|map, selection| {
@ -613,7 +620,7 @@ impl Vim {
self.stop_recording(cx);
self.visual_delete(false, cx)
}
Some(Operator::Yank) => self.visual_yank(cx),
Some(Operator::Yank) => self.visual_yank(false, cx),
_ => {} // Ignoring other operators
}
}