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

Clear out easy todo!()s

Browse source
This commit is contained in:
Conrad Irwin 2023-12-11 11:00:55 -07:00
parent dd42adc4e5
commit 8ed642dc16
6 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/vim2/src/command.rs
View file

@ -167,8 +167,7 @@ pub fn command_interceptor(mut query: &str, _: &AppContext) -> Option<CommandInt
.boxed_clone(),
),
"cq" | "cqu" | "cqui" | "cquit" | "cq!" | "cqu!" | "cqui!" | "cquit!" => {
// ("cquit!", zed_actions::Quit.boxed_clone())
todo!(); // Quit is no longer in zed actions :/
("cquit!", zed_actions::Quit.boxed_clone())
}
// pane management

6
crates/vim2/src/editor_events.rs
View file

@ -29,12 +29,6 @@ fn focused(editor: View<Editor>, cx: &mut WindowContext) {
Vim::update(cx, |vim, cx| {
vim.set_active_editor(editor.clone(), cx);
if vim.enabled {
// todo!()
// cx.emit_global(VimEvent::ModeChanged {
// mode: vim.state().mode,
// });
}
});
}

36
crates/vim2/src/vim.rs
View file

@ -326,9 +326,6 @@ impl Vim {
self.take_count(cx);
}
// todo!()
// cx.emit_global(VimEvent::ModeChanged { mode });
// Sync editor settings like clip mode
self.sync_vim_settings(cx);
@ -495,21 +492,24 @@ impl Vim {
let _ = cx.remove_global::<CommandPaletteInterceptor>();
}
// todo!();
// cx.update_active_window(|cx| {
// if self.enabled {
// let active_editor = cx
// .root_view()
// .downcast_ref::<Workspace>()
// .and_then(|workspace| workspace.read(cx).active_item(cx))
// .and_then(|item| item.downcast::<Editor>());
// if let Some(active_editor) = active_editor {
// self.set_active_editor(active_editor, cx);
// }
// self.switch_mode(Mode::Normal, false, cx);
// }
// self.sync_vim_settings(cx);
// });
if let Some(active_window) = cx.active_window() {
active_window
.update(cx, |root_view, cx| {
if self.enabled {
let active_editor = root_view
.downcast::<Workspace>()
.ok()
.and_then(|workspace| workspace.read(cx).active_item(cx))
.and_then(|item| item.downcast::<Editor>());
if let Some(active_editor) = active_editor {
self.set_active_editor(active_editor, cx);
}
self.switch_mode(Mode::Normal, false, cx);
}
self.sync_vim_settings(cx);
})
.ok();
}
}
}