From 17a4705eaac75d04a228c16da42b2a2bb14572eb Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 7 Feb 2025 13:59:14 -0500 Subject: [PATCH] Revert "assistant_context_editor: Fix patch block not rendering due to window reborrow (cherry-pick #24461) (#24463)" This reverts commit e7f64c7d98a289e0e6b11b86397ba90838738651. --- crates/assistant_context_editor/src/context_editor.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/assistant_context_editor/src/context_editor.rs b/crates/assistant_context_editor/src/context_editor.rs index f4509e1cf818b93d600eb5fee97db6c5585ddde2..86febdecc4dc6acb823a587ba3327e18e0d70aa4 100644 --- a/crates/assistant_context_editor/src/context_editor.rs +++ b/crates/assistant_context_editor/src/context_editor.rs @@ -832,13 +832,12 @@ impl ContextEditor { let render_block: RenderBlock = Arc::new({ let this = this.clone(); let patch_range = range.clone(); - move |cx: &mut BlockContext| { + move |cx: &mut BlockContext<'_, '_>| { let max_width = cx.max_width; let gutter_width = cx.gutter_dimensions.full_width(); let block_id = cx.block_id; let selected = cx.selected; - let window = &mut cx.window; - this.update(cx.app, |this, cx| { + this.update_in(cx, |this, window, cx| { this.render_patch_block( patch_range.clone(), max_width,