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

303
crates/debugger_ui/src/debugger_ui.rs
View file

@ -3,6 +3,7 @@ use std::any::TypeId;
use dap::debugger_settings::DebuggerSettings; use dap::debugger_settings::DebuggerSettings;
use debugger_panel::{DebugPanel, ToggleFocus}; use debugger_panel::{DebugPanel, ToggleFocus};
use editor::Editor; use editor::Editor;
use feature_flags::{DebuggerFeatureFlag, FeatureFlagViewExt};
use gpui::{App, DispatchPhase, EntityInputHandler, actions}; use gpui::{App, DispatchPhase, EntityInputHandler, actions};
use new_process_modal::{NewProcessModal, NewProcessMode}; use new_process_modal::{NewProcessModal, NewProcessMode};
use project::debugger::{self, breakpoint_store::SourceBreakpoint, session::ThreadStatus}; use project::debugger::{self, breakpoint_store::SourceBreakpoint, session::ThreadStatus};
@ -61,163 +62,173 @@ pub fn init(cx: &mut App) {
DebuggerSettings::register(cx); DebuggerSettings::register(cx);
workspace::FollowableViewRegistry::register::<DebugSession>(cx); workspace::FollowableViewRegistry::register::<DebugSession>(cx);
cx.observe_new(|workspace: &mut Workspace, _, _| { cx.observe_new(|_: &mut Workspace, window, cx| {
workspace let Some(window) = window else {
.register_action(spawn_task_or_modal) return;
.register_action(|workspace, _: &ToggleFocus, window, cx| { };
workspace.toggle_panel_focus::<DebugPanel>(window, cx);
})
.register_action(|workspace: &mut Workspace, _: &Start, window, cx| {
NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
})
.register_action(
|workspace: &mut Workspace, _: &RerunLastSession, window, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
return;
};
debug_panel.update(cx, |debug_panel, cx| { cx.when_flag_enabled::<DebuggerFeatureFlag>(window, |workspace, _, _| {
debug_panel.rerun_last_session(workspace, window, cx); workspace
}) .register_action(spawn_task_or_modal)
}, .register_action(|workspace, _: &ToggleFocus, window, cx| {
) workspace.toggle_panel_focus::<DebugPanel>(window, cx);
.register_action(
|workspace: &mut Workspace, _: &ShutdownDebugAdapters, _window, cx| {
workspace.project().update(cx, |project, cx| {
project.dap_store().update(cx, |store, cx| {
store.shutdown_sessions(cx).detach();
})
})
},
)
.register_action_renderer(|div, workspace, _, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
return div;
};
let Some(active_item) = debug_panel
.read(cx)
.active_session()
.map(|session| session.read(cx).running_state().clone())
else {
return div;
};
let running_state = active_item.read(cx);
if running_state.session().read(cx).is_terminated() {
return div;
}
let caps = running_state.capabilities(cx);
let supports_step_back = caps.supports_step_back.unwrap_or_default();
let supports_detach = running_state.session().read(cx).is_attached();
let status = running_state.thread_status(cx);
let active_item = active_item.downgrade();
div.when(status == Some(ThreadStatus::Running), |div| {
let active_item = active_item.clone();
div.on_action(move |_: &Pause, _, cx| {
active_item
.update(cx, |item, cx| item.pause_thread(cx))
.ok();
})
}) })
.when(status == Some(ThreadStatus::Stopped), |div| { .register_action(|workspace: &mut Workspace, _: &Start, window, cx| {
div.on_action({ NewProcessModal::show(workspace, window, NewProcessMode::Debug, None, cx);
})
.register_action(
|workspace: &mut Workspace, _: &RerunLastSession, window, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
return;
};
debug_panel.update(cx, |debug_panel, cx| {
debug_panel.rerun_last_session(workspace, window, cx);
})
},
)
.register_action(
|workspace: &mut Workspace, _: &ShutdownDebugAdapters, _window, cx| {
workspace.project().update(cx, |project, cx| {
project.dap_store().update(cx, |store, cx| {
store.shutdown_sessions(cx).detach();
})
})
},
)
.register_action_renderer(|div, workspace, _, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
return div;
};
let Some(active_item) = debug_panel
.read(cx)
.active_session()
.map(|session| session.read(cx).running_state().clone())
else {
return div;
};
let running_state = active_item.read(cx);
if running_state.session().read(cx).is_terminated() {
return div;
}
let caps = running_state.capabilities(cx);
let supports_step_back = caps.supports_step_back.unwrap_or_default();
let supports_detach = running_state.session().read(cx).is_attached();
let status = running_state.thread_status(cx);
let active_item = active_item.downgrade();
div.when(status == Some(ThreadStatus::Running), |div| {
let active_item = active_item.clone(); let active_item = active_item.clone();
move |_: &StepInto, _, cx| { div.on_action(move |_: &Pause, _, cx| {
active_item.update(cx, |item, cx| item.step_in(cx)).ok(); active_item
} .update(cx, |item, cx| item.pause_thread(cx))
}) .ok();
.on_action({
let active_item = active_item.clone();
move |_: &StepOver, _, cx| {
active_item.update(cx, |item, cx| item.step_over(cx)).ok();
}
})
.on_action({
let active_item = active_item.clone();
move |_: &StepOut, _, cx| {
active_item.update(cx, |item, cx| item.step_out(cx)).ok();
}
})
.when(supports_step_back, |div| {
let active_item = active_item.clone();
div.on_action(move |_: &StepBack, _, cx| {
active_item.update(cx, |item, cx| item.step_back(cx)).ok();
}) })
}) })
.on_action({ .when(status == Some(ThreadStatus::Stopped), |div| {
let active_item = active_item.clone(); div.on_action({
move |_: &Continue, _, cx| { let active_item = active_item.clone();
active_item move |_: &StepInto, _, cx| {
.update(cx, |item, cx| item.continue_thread(cx)) active_item.update(cx, |item, cx| item.step_in(cx)).ok();
.ok(); }
} })
}) .on_action({
.on_action(cx.listener( let active_item = active_item.clone();
|workspace, _: &ShowStackTrace, window, cx| { move |_: &StepOver, _, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else { active_item.update(cx, |item, cx| item.step_over(cx)).ok();
return; }
}; })
.on_action({
if let Some(existing) = workspace.item_of_type::<StackTraceView>(cx) { let active_item = active_item.clone();
let is_active = workspace move |_: &StepOut, _, cx| {
.active_item(cx) active_item.update(cx, |item, cx| item.step_out(cx)).ok();
.is_some_and(|item| item.item_id() == existing.item_id()); }
workspace.activate_item(&existing, true, !is_active, window, cx); })
} else { .when(supports_step_back, |div| {
let Some(active_session) = debug_panel.read(cx).active_session() let active_item = active_item.clone();
else { div.on_action(move |_: &StepBack, _, cx| {
active_item.update(cx, |item, cx| item.step_back(cx)).ok();
})
})
.on_action({
let active_item = active_item.clone();
move |_: &Continue, _, cx| {
active_item
.update(cx, |item, cx| item.continue_thread(cx))
.ok();
}
})
.on_action(cx.listener(
|workspace, _: &ShowStackTrace, window, cx| {
let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) else {
return; return;
}; };
let project = workspace.project(); if let Some(existing) = workspace.item_of_type::<StackTraceView>(cx)
{
let is_active = workspace
.active_item(cx)
.is_some_and(|item| item.item_id() == existing.item_id());
workspace
.activate_item(&existing, true, !is_active, window, cx);
} else {
let Some(active_session) =
debug_panel.read(cx).active_session()
else {
return;
};
let stack_trace_view = active_session.update(cx, |session, cx| { let project = workspace.project();
session.stack_trace_view(project, window, cx).clone()
});
workspace.add_item_to_active_pane( let stack_trace_view =
Box::new(stack_trace_view), active_session.update(cx, |session, cx| {
None, session.stack_trace_view(project, window, cx).clone()
true, });
window,
cx, workspace.add_item_to_active_pane(
); Box::new(stack_trace_view),
} None,
}, true,
)) window,
}) cx,
.when(supports_detach, |div| { );
let active_item = active_item.clone(); }
div.on_action(move |_: &Detach, _, cx| { },
active_item ))
.update(cx, |item, cx| item.detach_client(cx))
.ok();
}) })
}) .when(supports_detach, |div| {
.on_action({ let active_item = active_item.clone();
let active_item = active_item.clone(); div.on_action(move |_: &Detach, _, cx| {
move |_: &Restart, _, cx| { active_item
active_item .update(cx, |item, cx| item.detach_client(cx))
.update(cx, |item, cx| item.restart_session(cx)) .ok();
.ok(); })
} })
}) .on_action({
.on_action({ let active_item = active_item.clone();
let active_item = active_item.clone(); move |_: &Restart, _, cx| {
move |_: &Stop, _, cx| { active_item
active_item.update(cx, |item, cx| item.stop_thread(cx)).ok(); .update(cx, |item, cx| item.restart_session(cx))
} .ok();
}) }
.on_action({ })
let active_item = active_item.clone(); .on_action({
move |_: &ToggleIgnoreBreakpoints, _, cx| { let active_item = active_item.clone();
active_item move |_: &Stop, _, cx| {
.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx)) active_item.update(cx, |item, cx| item.stop_thread(cx)).ok();
.ok(); }
} })
}) .on_action({
}); let active_item = active_item.clone();
move |_: &ToggleIgnoreBreakpoints, _, cx| {
active_item
.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
.ok();
}
})
});
})
}) })
.detach(); .detach();

77
crates/editor/src/editor.rs
View file

@ -73,7 +73,7 @@ use element::{AcceptEditPredictionBinding, LineWithInvisibles, PositionMap, layo
pub use element::{ pub use element::{
CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition, CursorLayout, EditorElement, HighlightedRange, HighlightedRangeLine, PointForPosition,
}; };
use feature_flags::FeatureFlagAppExt; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt};
use futures::{ use futures::{
FutureExt, StreamExt as _, FutureExt, StreamExt as _,
future::{self, Shared, join}, future::{self, Shared, join},
@ -5969,41 +5969,45 @@ impl Editor {
buffer: &Entity<Buffer>, buffer: &Entity<Buffer>,
cx: &mut App, cx: &mut App,
) -> Task<Vec<task::DebugScenario>> { ) -> Task<Vec<task::DebugScenario>> {
maybe!({ if cx.has_flag::<DebuggerFeatureFlag>() {
let project = self.project.as_ref()?; maybe!({
let dap_store = project.read(cx).dap_store(); let project = self.project.as_ref()?;
let mut scenarios = vec![]; let dap_store = project.read(cx).dap_store();
let resolved_tasks = resolved_tasks.as_ref()?; let mut scenarios = vec![];
let buffer = buffer.read(cx); let resolved_tasks = resolved_tasks.as_ref()?;
let language = buffer.language()?; let buffer = buffer.read(cx);
let file = buffer.file(); let language = buffer.language()?;
let debug_adapter = language_settings(language.name().into(), file, cx) let file = buffer.file();
.debuggers let debug_adapter = language_settings(language.name().into(), file, cx)
.first() .debuggers
.map(SharedString::from) .first()
.or_else(|| language.config().debuggers.first().map(SharedString::from))?; .map(SharedString::from)
.or_else(|| language.config().debuggers.first().map(SharedString::from))?;
dap_store.update(cx, |dap_store, cx| { dap_store.update(cx, |dap_store, cx| {
for (_, task) in &resolved_tasks.templates { for (_, task) in &resolved_tasks.templates {
let maybe_scenario = dap_store.debug_scenario_for_build_task( let maybe_scenario = dap_store.debug_scenario_for_build_task(
task.original_task().clone(), task.original_task().clone(),
debug_adapter.clone().into(), debug_adapter.clone().into(),
task.display_label().to_owned().into(), task.display_label().to_owned().into(),
cx, cx,
); );
scenarios.push(maybe_scenario); scenarios.push(maybe_scenario);
} }
}); });
Some(cx.background_spawn(async move { Some(cx.background_spawn(async move {
let scenarios = futures::future::join_all(scenarios) let scenarios = futures::future::join_all(scenarios)
.await .await
.into_iter() .into_iter()
.flatten() .flatten()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
scenarios scenarios
})) }))
}) })
.unwrap_or_else(|| Task::ready(vec![])) .unwrap_or_else(|| Task::ready(vec![]))
} else {
Task::ready(vec![])
}
} }
fn code_actions( fn code_actions(
@ -10151,6 +10155,9 @@ impl Editor {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
if !cx.has_flag::<DebuggerFeatureFlag>() {
return;
}
let source = self let source = self
.buffer .buffer
.read(cx) .read(cx)

95
crates/editor/src/element.rs
View file

@ -32,7 +32,7 @@ use crate::{
}; };
use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind}; use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
use collections::{BTreeMap, HashMap}; use collections::{BTreeMap, HashMap};
use feature_flags::FeatureFlagAppExt; use feature_flags::{DebuggerFeatureFlag, FeatureFlagAppExt};
use file_icons::FileIcons; use file_icons::FileIcons;
use git::{ use git::{
Oid, Oid,
@ -567,10 +567,12 @@ impl EditorElement {
register_action(editor, window, Editor::insert_uuid_v4); register_action(editor, window, Editor::insert_uuid_v4);
register_action(editor, window, Editor::insert_uuid_v7); register_action(editor, window, Editor::insert_uuid_v7);
register_action(editor, window, Editor::open_selections_in_multibuffer); register_action(editor, window, Editor::open_selections_in_multibuffer);
register_action(editor, window, Editor::toggle_breakpoint); if cx.has_flag::<DebuggerFeatureFlag>() {
register_action(editor, window, Editor::edit_log_breakpoint); register_action(editor, window, Editor::toggle_breakpoint);
register_action(editor, window, Editor::enable_breakpoint); register_action(editor, window, Editor::edit_log_breakpoint);
register_action(editor, window, Editor::disable_breakpoint); register_action(editor, window, Editor::enable_breakpoint);
register_action(editor, window, Editor::disable_breakpoint);
}
} }
fn register_key_listeners(&self, window: &mut Window, _: &mut App, layout: &EditorLayout) { fn register_key_listeners(&self, window: &mut Window, _: &mut App, layout: &EditorLayout) {
@ -8171,9 +8173,11 @@ impl Element for EditorElement {
let mut breakpoint_rows = self.editor.update(cx, |editor, cx| { let mut breakpoint_rows = self.editor.update(cx, |editor, cx| {
editor.active_breakpoints(start_row..end_row, window, cx) editor.active_breakpoints(start_row..end_row, window, cx)
}); });
for (display_row, (_, bp, state)) in &breakpoint_rows { if cx.has_flag::<DebuggerFeatureFlag>() {
if bp.is_enabled() && state.is_none_or(|s| s.verified) { for (display_row, (_, bp, state)) in &breakpoint_rows {
active_rows.entry(*display_row).or_default().breakpoint = true; if bp.is_enabled() && state.is_none_or(|s| s.verified) {
active_rows.entry(*display_row).or_default().breakpoint = true;
}
} }
} }
@ -8194,27 +8198,30 @@ impl Element for EditorElement {
// We add the gutter breakpoint indicator to breakpoint_rows after painting // We add the gutter breakpoint indicator to breakpoint_rows after painting
// line numbers so we don't paint a line number debug accent color if a user // line numbers so we don't paint a line number debug accent color if a user
// has their mouse over that line when a breakpoint isn't there // has their mouse over that line when a breakpoint isn't there
self.editor.update(cx, |editor, _| { if cx.has_flag::<DebuggerFeatureFlag>() {
if let Some(phantom_breakpoint) = &mut editor self.editor.update(cx, |editor, _| {
.gutter_breakpoint_indicator if let Some(phantom_breakpoint) = &mut editor
.0 .gutter_breakpoint_indicator
.filter(|phantom_breakpoint| phantom_breakpoint.is_active) .0
{ .filter(|phantom_breakpoint| phantom_breakpoint.is_active)
// Is there a non-phantom breakpoint on this line? {
phantom_breakpoint.collides_with_existing_breakpoint = true; // Is there a non-phantom breakpoint on this line?
breakpoint_rows phantom_breakpoint.collides_with_existing_breakpoint = true;
.entry(phantom_breakpoint.display_row) breakpoint_rows
.or_insert_with(|| { .entry(phantom_breakpoint.display_row)
let position = snapshot.display_point_to_anchor( .or_insert_with(|| {
DisplayPoint::new(phantom_breakpoint.display_row, 0), let position = snapshot.display_point_to_anchor(
Bias::Right, DisplayPoint::new(phantom_breakpoint.display_row, 0),
); Bias::Right,
let breakpoint = Breakpoint::new_standard(); );
phantom_breakpoint.collides_with_existing_breakpoint = false; let breakpoint = Breakpoint::new_standard();
(position, breakpoint, None) phantom_breakpoint.collides_with_existing_breakpoint =
}); false;
} (position, breakpoint, None)
}); });
}
})
}
let mut expand_toggles = let mut expand_toggles =
window.with_element_namespace("expand_toggles", |window| { window.with_element_namespace("expand_toggles", |window| {
@ -8683,19 +8690,23 @@ impl Element for EditorElement {
let show_breakpoints = snapshot let show_breakpoints = snapshot
.show_breakpoints .show_breakpoints
.unwrap_or(gutter_settings.breakpoints); .unwrap_or(gutter_settings.breakpoints);
let breakpoints = self.layout_breakpoints( let breakpoints = if cx.has_flag::<DebuggerFeatureFlag>() && show_breakpoints {
line_height, self.layout_breakpoints(
start_row..end_row, line_height,
scroll_pixel_position, start_row..end_row,
&gutter_dimensions, scroll_pixel_position,
&gutter_hitbox, &gutter_dimensions,
&display_hunks, &gutter_hitbox,
&snapshot, &display_hunks,
breakpoint_rows, &snapshot,
&row_infos, breakpoint_rows,
window, &row_infos,
cx, window,
); cx,
)
} else {
vec![]
};
self.layout_signature_help( self.layout_signature_help(
&hitbox, &hitbox,

5
crates/feature_flags/src/feature_flags.rs
View file

@ -77,6 +77,11 @@ impl FeatureFlag for NotebookFeatureFlag {
const NAME: &'static str = "notebooks"; const NAME: &'static str = "notebooks";
} }
pub struct DebuggerFeatureFlag {}
impl FeatureFlag for DebuggerFeatureFlag {
const NAME: &'static str = "debugger";
}
pub struct ThreadAutoCaptureFeatureFlag {} pub struct ThreadAutoCaptureFeatureFlag {}
impl FeatureFlag for ThreadAutoCaptureFeatureFlag { impl FeatureFlag for ThreadAutoCaptureFeatureFlag {
const NAME: &'static str = "thread-auto-capture"; const NAME: &'static str = "thread-auto-capture";

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

@ -20,6 +20,7 @@ use collections::VecDeque;
use debugger_ui::debugger_panel::DebugPanel; use debugger_ui::debugger_panel::DebugPanel;
use editor::ProposedChangesEditorToolbar; use editor::ProposedChangesEditorToolbar;
use editor::{Editor, MultiBuffer, scroll::Autoscroll}; use editor::{Editor, MultiBuffer, scroll::Autoscroll};
use feature_flags::{DebuggerFeatureFlag, FeatureFlagViewExt};
use futures::future::Either; use futures::future::Either;
use futures::{StreamExt, channel::mpsc, select_biased}; use futures::{StreamExt, channel::mpsc, select_biased};
use git_ui::git_panel::GitPanel; use git_ui::git_panel::GitPanel;
@ -480,7 +481,6 @@ fn initialize_panels(
workspace_handle.clone(), workspace_handle.clone(),
cx.clone(), cx.clone(),
); );
let debug_panel = DebugPanel::load(workspace_handle.clone(), cx);
let ( let (
project_panel, project_panel,
@ -490,7 +490,6 @@ fn initialize_panels(
channels_panel, channels_panel,
chat_panel, chat_panel,
notification_panel, notification_panel,
debug_panel,
) = futures::try_join!( ) = futures::try_join!(
project_panel, project_panel,
outline_panel, outline_panel,
@ -499,7 +498,6 @@ fn initialize_panels(
channels_panel, channels_panel,
chat_panel, chat_panel,
notification_panel, notification_panel,
debug_panel,
)?; )?;
workspace_handle.update_in(cx, |workspace, window, cx| { 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(channels_panel, window, cx);
workspace.add_panel(chat_panel, window, cx); workspace.add_panel(chat_panel, window, cx);
workspace.add_panel(notification_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); let is_assistant2_enabled = !cfg!(test);