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

Remove potential crash when missing worktrees (#12291)

Browse source 
This PR removes a potential crash when there are no worktrees in the
project.

Present on Nightly only.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-05-25 15:24:15 -04:00 • committed by GitHub
parent ace371a0d8
commit 8450d63ed6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1132,9 +1132,10 @@ impl AssistantPanel {
let lsp_adapter_delegate = workspace let lsp_adapter_delegate = workspace
.update(cx, |workspace, cx| { .update(cx, |workspace, cx| {
make_lsp_adapter_delegate(workspace.project(), cx) make_lsp_adapter_delegate(workspace.project(), cx).log_err()
}) })
.log_err(); .log_err()
.flatten();
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let saved_conversation = SavedConversation::load(&path, fs.as_ref()).await?; let saved_conversation = SavedConversation::load(&path, fs.as_ref()).await?;
@ -2749,7 +2750,7 @@ impl ConversationEditor {
) -> Self { ) -> Self {
let telemetry = workspace.read(cx).client().telemetry().clone(); let telemetry = workspace.read(cx).client().telemetry().clone();
let project = workspace.read(cx).project().clone(); let project = workspace.read(cx).project().clone();
let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx); let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx).log_err();
let conversation = cx.new_model(|cx| { let conversation = cx.new_model(|cx| {
Conversation::new( Conversation::new(
@ -2757,7 +2758,7 @@ impl ConversationEditor {
language_registry, language_registry,
slash_command_registry, slash_command_registry,
Some(telemetry), Some(telemetry),
Some(lsp_adapter_delegate), lsp_adapter_delegate,
cx, cx,
) )
}); });
@ -3934,14 +3935,14 @@ fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
fn make_lsp_adapter_delegate( fn make_lsp_adapter_delegate(
project: &Model<Project>, project: &Model<Project>,
cx: &mut AppContext, cx: &mut AppContext,
) -> Arc<dyn LspAdapterDelegate> { ) -> Result<Arc<dyn LspAdapterDelegate>> {
project.update(cx, |project, cx| { project.update(cx, |project, cx| {
// TODO: Find the right worktree. // TODO: Find the right worktree.
let worktree = project let worktree = project
.worktrees() .worktrees()
.next() .next()
.expect("expected at least one worktree"); .ok_or_else(|| anyhow!("no worktrees when constructing ProjectLspAdapterDelegate"))?;
ProjectLspAdapterDelegate::new(project, &worktree, cx) Ok(ProjectLspAdapterDelegate::new(project, &worktree, cx) as Arc<dyn LspAdapterDelegate>)
}) })
} }