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

Assistant: propagate cancel action if there is no pending inline assist (#2923)

Browse source 
Release Notes:

- Fixed a bug where modals could not be dismissed with `escape` when
certain views were active in the workspace (preview only).
This commit is contained in:
Max Brunsfeld 2023-08-31 11:17:09 -07:00 • committed by GitHub
commit 00aae5abee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/ai/src/assistant.rs
View file

@ -406,36 +406,30 @@ impl AssistantPanel {
_: &editor::Cancel, _: &editor::Cancel,
cx: &mut ViewContext<Workspace>, cx: &mut ViewContext<Workspace>,
) { ) {
let panel = if let Some(panel) = workspace.panel::<AssistantPanel>(cx) { if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
panel if let Some(editor) = workspace
} else { .active_item(cx)
return; .and_then(|item| item.downcast::<Editor>())
};
let editor = if let Some(editor) = workspace
.active_item(cx)
.and_then(|item| item.downcast::<Editor>())
{
editor
} else {
return;
};
let handled = panel.update(cx, |panel, cx| {
if let Some(assist_id) = panel
.pending_inline_assist_ids_by_editor
.get(&editor.downgrade())
.and_then(|assist_ids| assist_ids.last().copied())
{ {
panel.close_inline_assist(assist_id, true, cx); let handled = panel.update(cx, |panel, cx| {
true if let Some(assist_id) = panel
} else { .pending_inline_assist_ids_by_editor
false .get(&editor.downgrade())
.and_then(|assist_ids| assist_ids.last().copied())
{
panel.close_inline_assist(assist_id, true, cx);
true
} else {
false
}
});
if handled {
return;
}
} }
});
if !handled {
cx.propagate_action();
} }
cx.propagate_action();
} }
fn close_inline_assist(&mut self, assist_id: usize, undo: bool, cx: &mut ViewContext<Self>) { fn close_inline_assist(&mut self, assist_id: usize, undo: bool, cx: &mut ViewContext<Self>) {