mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 19:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Propagate Cancel action if there is no pending inline assist

Browse source
This commit is contained in:
Max Brunsfeld 2023-08-31 11:09:36 -07:00
parent ddc6214216
commit eecd4e39cc
1 changed files with 21 additions and 27 deletions
Show stats 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,
cx: &mut ViewContext<Workspace>,
) {
let panel = if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
panel
} else {
return;
};
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())
if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
if let Some(editor) = workspace
.active_item(cx)
.and_then(|item| item.downcast::<Editor>())
{
panel.close_inline_assist(assist_id, true, cx);
true
} else {
false
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);
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>) {