From 444f918e51effada7097cec8a4857bb9a21b5823 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 28 Jan 2024 15:25:57 -0500 Subject: [PATCH] Retrieve credentials for saved conversations (#6949) This PR fixes an issue where credentials for saved conversations weren't being fully retrieved, which was preventing continuing a conversation with the assistant in a saved conversation. Release Notes: - Fixed continuing a saved conversation with the Zed assistant. --- crates/assistant/src/assistant_panel.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 2488e2c763..9e21248a1d 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -1096,6 +1096,7 @@ impl AssistantPanel { let conversation = Conversation::deserialize(saved_conversation, path.clone(), languages, &mut cx) .await?; + this.update(&mut cx, |this, cx| { // If, by the time we've loaded the conversation, the user has already opened // the same conversation, we don't want to open it again. @@ -1507,7 +1508,9 @@ impl Conversation { ) .await, ); - cx.update(|cx| completion_provider.retrieve_credentials(cx))?; + cx.update(|cx| completion_provider.retrieve_credentials(cx))? + .await; + let markdown = language_registry.language_for_name("Markdown"); let mut message_anchors = Vec::new(); let mut next_message_id = MessageId(0); @@ -1676,6 +1679,7 @@ impl Conversation { if should_assist { if !self.completion_provider.has_credentials() { + log::info!("completion provider has no credentials"); return Default::default(); }