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

vim: Fix search in the Assistant (#20258)

Browse source 
Closes #17704

Release Notes:

- vim: Fix search in the assistant panel
This commit is contained in:
Conrad Irwin 2024-11-05 15:08:01 -07:00 • committed by GitHub
parent c527f2e212
commit 4bf6fb217e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,9 @@ impl Vim {
}
fn search(&mut self, action: &Search, cx: &mut ViewContext<Self>) {
let Some(pane) = self.pane(cx) else { return };
let Some(pane) = self.pane(cx) else {
return;
};
let direction = if action.backwards {
Direction::Prev
} else {

23
crates/vim/src/vim.rs
View file

@ -114,12 +114,13 @@ pub fn init(cx: &mut AppContext) {
});
workspace.register_action(|workspace, _: &SearchSubmit, cx| {
let Some(vim) = workspace
.active_item_as::<Editor>(cx)
.and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned())
else {
return;
};
let vim = workspace
.focused_pane(cx)
.read(cx)
.active_item()
.and_then(|item| item.act_as::<Editor>(cx))
.and_then(|editor| editor.read(cx).addon::<VimAddon>().cloned());
let Some(vim) = vim else { return };
vim.view
.update(cx, |_, cx| cx.defer(|vim, cx| vim.search_submit(cx)))
});
@ -334,13 +335,15 @@ impl Vim {
self.editor.upgrade()
}
pub fn workspace(&self, cx: &ViewContext<Self>) -> Option<View<Workspace>> {
self.editor().and_then(|editor| editor.read(cx).workspace())
pub fn workspace(&self, cx: &mut ViewContext<Self>) -> Option<View<Workspace>> {
cx.window_handle()
.downcast::<Workspace>()
.and_then(|handle| handle.root(cx).ok())
}
pub fn pane(&self, cx: &ViewContext<Self>) -> Option<View<Pane>> {
pub fn pane(&self, cx: &mut ViewContext<Self>) -> Option<View<Pane>> {
self.workspace(cx)
.and_then(|workspace| workspace.read(cx).pane_for(&self.editor()?))
.map(|workspace| workspace.read(cx).focused_pane(cx))
}
pub fn enabled(cx: &mut AppContext) -> bool {

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

@ -576,14 +576,9 @@ impl Vim {
pub fn select_match(&mut self, direction: Direction, cx: &mut ViewContext<Self>) {
let count = self.take_count(cx).unwrap_or(1);
let Some(workspace) = self
.editor
.upgrade()
.and_then(|editor| editor.read(cx).workspace())
else {
let Some(pane) = self.pane(cx) else {
return;
};
let pane = workspace.read(cx).active_pane().clone();
let vim_is_normal = self.mode == Mode::Normal;
let mut start_selection = 0usize;
let mut end_selection = 0usize;