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

Revert "debugger: Remove feature flag"

Browse source 
This reverts commit 82dfa82ba7.
This commit is contained in:
Conrad Irwin 2025-06-17 09:28:35 -06:00
parent 82dfa82ba7
commit b1e59b1371
5 changed files with 272 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/zed/src/zed.rs
View file

@ -20,6 +20,7 @@ use collections::VecDeque;
use debugger_ui::debugger_panel::DebugPanel;
use editor::ProposedChangesEditorToolbar;
use editor::{Editor, MultiBuffer, scroll::Autoscroll};
use feature_flags::{DebuggerFeatureFlag, FeatureFlagViewExt};
use futures::future::Either;
use futures::{StreamExt, channel::mpsc, select_biased};
use git_ui::git_panel::GitPanel;
@ -480,7 +481,6 @@ fn initialize_panels(
workspace_handle.clone(),
cx.clone(),
);
let debug_panel = DebugPanel::load(workspace_handle.clone(), cx);
let (
project_panel,
@ -490,7 +490,6 @@ fn initialize_panels(
channels_panel,
chat_panel,
notification_panel,
debug_panel,
) = futures::try_join!(
project_panel,
outline_panel,
@ -499,7 +498,6 @@ fn initialize_panels(
channels_panel,
chat_panel,
notification_panel,
debug_panel,
)?;
workspace_handle.update_in(cx, |workspace, window, cx| {
@ -510,7 +508,20 @@ fn initialize_panels(
workspace.add_panel(channels_panel, window, cx);
workspace.add_panel(chat_panel, window, cx);
workspace.add_panel(notification_panel, window, cx);
workspace.add_panel(debug_panel, window, cx);
cx.when_flag_enabled::<DebuggerFeatureFlag>(window, |_, window, cx| {
cx.spawn_in(
window,
async move |workspace: gpui::WeakEntity<Workspace>,
cx: &mut AsyncWindowContext| {
let debug_panel = DebugPanel::load(workspace.clone(), cx).await?;
workspace.update_in(cx, |workspace, window, cx| {
workspace.add_panel(debug_panel, window, cx);
})?;
anyhow::Ok(())
},
)
.detach()
});
})?;
let is_assistant2_enabled = !cfg!(test);