zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

vim: Revert 'Y' to yank to end of line (#17563)

Browse Source 
Closes https://github.com/zed-industries/zed/issues/17549
This commit is contained in:
Vishal Bhavsar 2024-09-08 10:38:00 -04:00 committed by GitHub
parent 894866da94
commit 89ae97e5e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/keymaps/vim.json
View File

@ -214,7 +214,7 @@
"shift-d": "vim::DeleteToEndOfLine",
"shift-j": "vim::JoinLines",
"y": ["vim::PushOperator", "Yank"],
"shift-y": "vim::YankToEndOfLine",
"shift-y": "vim::YankLine",
"i": "vim::InsertBefore",
"shift-i": "vim::InsertFirstNonWhitespace",
"a": "vim::InsertAfter",

23
crates/vim/src/normal.rs
View File

@ -52,7 +52,6 @@ actions!(
DeleteToEndOfLine,
Yank,
YankLine,
YankToEndOfLine,
ChangeCase,
ConvertToUpperCase,
ConvertToLowerCase,
@ -77,7 +76,6 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut ViewContext<Vim>) {
Vim::action(editor, cx, Vim::convert_to_upper_case);
Vim::action(editor, cx, Vim::convert_to_lower_case);
Vim::action(editor, cx, Vim::yank_line);
Vim::action(editor, cx, Vim::yank_to_end_of_line);
Vim::action(editor, cx, Vim::toggle_comments);
Vim::action(editor, cx, Vim::paste);
@ -428,18 +426,6 @@ impl Vim {
self.yank_motion(motion::Motion::CurrentLine, count, cx)
}
fn yank_to_end_of_line(&mut self, _: &YankToEndOfLine, cx: &mut ViewContext<Self>) {
self.record_current_action(cx);
let count = self.take_count(cx);
self.yank_motion(
motion::Motion::EndOfLine {
display_lines: false,
},
count,
cx,
)
}
fn toggle_comments(&mut self, _: &ToggleComments, cx: &mut ViewContext<Self>) {
self.record_current_action(cx);
self.update_editor(cx, |_, editor, cx| {
@ -1408,15 +1394,6 @@ mod test {
);
}
#[gpui::test]
async fn test_shift_y(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;
cx.set_shared_state("helˇlo\n").await;
cx.simulate_shared_keystrokes("shift-y").await;
cx.shared_clipboard().await.assert_eq("lo");
}
#[gpui::test]
async fn test_r(cx: &mut gpui::TestAppContext) {
let mut cx = NeovimBackedTestContext::new(cx).await;

4
crates/vim/test_data/test_shift_y.json
View File

@ -1,4 +0,0 @@
{"Put":{"state":"helˇlo\n"}}
{"Key":"shift-y"}
{"Get":{"state":"helˇlo\n","mode":"Normal"}}
{"ReadRegister":{"name":"\"","value":"lo"}}