RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:17:44 +00:00
Code Issues Activity Actions

HackStudio: Make Editor ask Debugger if a breakpoint was added/removed

Browse source 
Rather than adding/removing a breakpoint indicator, and then telling the
debugger about it and hoping it works, let the debugger tell us if it
succeeded and then use that to update the indicator.

This prevents the user from adding breakpoints to invalid locations
while the debugger is running. It also avoids a couple of scary
VERIFY()s. We still allow creating breakpoints in invalid locations
while the debugger is *not* running.
This commit is contained in:
Sam Atkins 2024-01-11 14:57:57 +00:00 • committed by Andrew Kaster
parent 3910efb80b
commit ad59fb7cf0
3 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/DevTools/HackStudio/Editor.cpp
View file

@ -1,6 +1,7 @@
/*
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2018-2022, the SerenityOS developers.
* Copyright (c) 2023-2024, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -774,9 +775,10 @@ void Editor::set_semantic_syntax_highlighting(bool value)
ErrorOr<void> Editor::add_breakpoint(size_t line_number)
{
if (!breakpoint_lines().contains_slow(line_number)) {
add_gutter_indicator(m_breakpoint_indicator_id, line_number);
TRY(breakpoint_lines().try_append(line_number));
Debugger::the().on_breakpoint_change(wrapper().filename_title(), line_number, BreakpointChange::Added);
if (Debugger::the().change_breakpoint(wrapper().filename_title(), line_number, BreakpointChange::Added)) {
add_gutter_indicator(m_breakpoint_indicator_id, line_number);
TRY(breakpoint_lines().try_append(line_number));
}
}
return {};
@ -784,9 +786,10 @@ ErrorOr<void> Editor::add_breakpoint(size_t line_number)
void Editor::remove_breakpoint(size_t line_number)
{
remove_gutter_indicator(m_breakpoint_indicator_id, line_number);
breakpoint_lines().remove_first_matching([&](size_t line) { return line == line_number; });
Debugger::the().on_breakpoint_change(wrapper().filename_title(), line_number, BreakpointChange::Removed);
if (Debugger::the().change_breakpoint(wrapper().filename_title(), line_number, BreakpointChange::Removed)) {
remove_gutter_indicator(m_breakpoint_indicator_id, line_number);
breakpoint_lines().remove_first_matching([&](size_t line) { return line == line_number; });
}
}
ErrorOr<void> Editor::update_git_diff_indicators()