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

debugger_ui: Don't .unwrap debug panel access (#28131)

Browse source 
This PR removes replaces the `.unwrap`s when accessing the debug panel
with `if let Some`s.

These `.unwrap`s are not locally verifiable, and thus are not safe.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-04-04 18:54:40 -04:00 • committed by GitHub
parent 8b077f0c41
commit e3d212ac60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 69 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,80 +49,80 @@ pub fn init(cx: &mut App) {
workspace.toggle_panel_focus::<DebugPanel>(window, cx); workspace.toggle_panel_focus::<DebugPanel>(window, cx);
}) })
.register_action(|workspace, _: &Pause, _, cx| { .register_action(|workspace, _: &Pause, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.pause_thread(cx))
active_item.update(cx, |item, cx| item.pause_thread(cx)) }
} }
}) })
.register_action(|workspace, _: &Restart, _, cx| { .register_action(|workspace, _: &Restart, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.restart_session(cx))
active_item.update(cx, |item, cx| item.restart_session(cx)) }
} }
}) })
.register_action(|workspace, _: &StepInto, _, cx| { .register_action(|workspace, _: &StepInto, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.step_in(cx))
active_item.update(cx, |item, cx| item.step_in(cx)) }
} }
}) })
.register_action(|workspace, _: &StepOver, _, cx| { .register_action(|workspace, _: &StepOver, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.step_over(cx))
active_item.update(cx, |item, cx| item.step_over(cx)) }
} }
}) })
.register_action(|workspace, _: &StepBack, _, cx| { .register_action(|workspace, _: &StepBack, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.step_back(cx))
active_item.update(cx, |item, cx| item.step_back(cx)) }
} }
}) })
.register_action(|workspace, _: &Stop, _, cx| { .register_action(|workspace, _: &Stop, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.stop_thread(cx))
active_item.update(cx, |item, cx| item.stop_thread(cx)) }
} }
}) })
.register_action(|workspace, _: &ToggleIgnoreBreakpoints, _, cx| { .register_action(|workspace, _: &ToggleIgnoreBreakpoints, _, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| {
if let Some(active_item) = debug_panel.read_with(cx, |panel, cx| { panel
panel .active_session(cx)
.active_session(cx) .and_then(|session| session.read(cx).mode().as_running().cloned())
.and_then(|session| session.read(cx).mode().as_running().cloned()) }) {
}) { active_item.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx))
active_item.update(cx, |item, cx| item.toggle_ignore_breakpoints(cx)) }
} }
}) })
.register_action( .register_action(
@ -136,19 +136,20 @@ pub fn init(cx: &mut App) {
) )
.register_action( .register_action(
|workspace: &mut Workspace, _: &CreateDebuggingSession, window, cx| { |workspace: &mut Workspace, _: &CreateDebuggingSession, window, cx| {
let debug_panel = workspace.panel::<DebugPanel>(cx).unwrap(); if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
let weak_panel = debug_panel.downgrade(); let weak_panel = debug_panel.downgrade();
let weak_workspace = cx.weak_entity(); let weak_workspace = cx.weak_entity();
workspace.toggle_modal(window, cx, |window, cx| { workspace.toggle_modal(window, cx, |window, cx| {
NewSessionModal::new( NewSessionModal::new(
debug_panel.read(cx).past_debug_definition.clone(), debug_panel.read(cx).past_debug_definition.clone(),
weak_panel, weak_panel,
weak_workspace, weak_workspace,
window, window,
cx, cx,
) )
}); });
}
}, },
); );
}) })