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

Fix double lease panic in Quote Selection command (#12217)

Browse source 
Release Notes:

- Fixed a panic that occurred when using the `assistant: quote
selection` command while signed out.
This commit is contained in:
Max Brunsfeld 2024-05-23 12:14:34 -07:00 • committed by GitHub
parent 9c35187aac
commit e15b902974
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

58
crates/assistant/src/assistant_panel.rs
View file

@ -3271,52 +3271,26 @@ impl ConversationEditor {
}
if let Some(text) = text {
panel.update(cx, |panel, cx| {
if let Some(conversation) = panel
.active_conversation_editor()
.cloned()
.or_else(|| panel.new_conversation(cx))
{
conversation.update(cx, |conversation, cx| {
conversation
.editor
.update(cx, |editor, cx| editor.insert(&text, cx))
});
};
panel.update(cx, |_, cx| {
// Wait to create a new conversation until the workspace is no longer
// being updated.
cx.defer(move |panel, cx| {
if let Some(conversation) = panel
.active_conversation_editor()
.cloned()
.or_else(|| panel.new_conversation(cx))
{
conversation.update(cx, |conversation, cx| {
conversation
.editor
.update(cx, |editor, cx| editor.insert(&text, cx))
});
};
});
});
}
}
// fn insert_active_prompt(
// workspace: &mut Workspace,
// _: &InsertActivePrompt,
// cx: &mut ViewContext<Workspace>,
// ) {
// let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
// return;
// };
// if !panel.focus_handle(cx).contains_focused(cx) {
// workspace.toggle_panel_focus::<AssistantPanel>(cx);
// }
// if let Some(default_prompt) = panel.read(cx).prompt_library.clone().default_prompt() {
// panel.update(cx, |panel, cx| {
// if let Some(conversation) = panel
// .active_conversation_editor()
// .cloned()
// .or_else(|| panel.new_conversation(cx))
// {
// conversation.update(cx, |conversation, cx| {
// conversation
// .editor
// .update(cx, |editor, cx| editor.insert(&default_prompt, cx))
// });
// };
// });
// };
// }
fn copy(&mut self, _: &editor::actions::Copy, cx: &mut ViewContext<Self>) {
let editor = self.editor.read(cx);
let conversation = self.conversation.read(cx);