system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

HackStudio: Migrate breakpoint indicators to TextEditor API

Browse source
This commit is contained in:
Sam Atkins 2023-03-15 11:05:32 +00:00 committed by Andreas Kling
parent 4b29702fee
commit 99221a436e
2 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,18 @@ Editor::Editor()
add_custom_context_menu_action(*m_move_execution_to_line_action);
set_gutter_visible(true);
on_gutter_click = [&](auto line, auto) {
add_breakpoint(line).release_value_but_fixme_should_propagate_errors();
};
m_breakpoint_indicator_id = register_gutter_indicator(
[&](auto& painter, Gfx::IntRect rect, size_t) {
auto const& icon = breakpoint_icon_bitmap();
painter.draw_scaled_bitmap(rect, icon, icon.rect());
},
[&](size_t line_index, auto) {
remove_breakpoint(line_index);
}).release_value_but_fixme_should_propagate_errors();
if (Config::read_string("HackStudio"sv, "Global"sv, "DocumentationSearchPaths"sv).is_empty()) {
Config::write_string("HackStudio"sv, "Global"sv, "DocumentationSearchPaths"sv, "[\"/usr/share/man/man2\", \"/usr/share/man/man3\"]"sv);
@ -146,13 +158,6 @@ void Editor::paint_event(GUI::PaintEvent& event)
size_t first_visible_line = text_position_at(event.rect().top_left()).line();
size_t last_visible_line = text_position_at(event.rect().bottom_right()).line();
for (size_t line : breakpoint_lines()) {
if (line < first_visible_line || line > last_visible_line) {
continue;
}
auto const& icon = breakpoint_icon_bitmap();
painter.blit(gutter_icon_rect(line).top_left(), icon, icon.rect());
}
if (execution_position().has_value()) {
auto const& icon = current_position_icon_bitmap();
painter.blit(gutter_icon_rect(execution_position().value()).top_left(), icon, icon.rect());
@ -344,16 +349,6 @@ void Editor::mousedown_event(GUI::MouseEvent& event)
}
auto text_position = text_position_at(event.position());
auto ruler_line_rect = ruler_content_rect(text_position.line());
if (event.button() == GUI::MouseButton::Primary && event.position().x() < ruler_line_rect.width()) {
if (!breakpoint_lines().contains_slow(text_position.line())) {
breakpoint_lines().append(text_position.line());
Debugger::the().on_breakpoint_change(wrapper().filename_title(), text_position.line(), BreakpointChange::Added);
} else {
breakpoint_lines().remove_first_matching([&](size_t line) { return line == text_position.line(); });
Debugger::the().on_breakpoint_change(wrapper().filename_title(), text_position.line(), BreakpointChange::Removed);
}
}
if (!(event.modifiers() & Mod_Ctrl)) {
GUI::TextEditor::mousedown_event(event);
@ -810,4 +805,22 @@ void Editor::set_semantic_syntax_highlighting(bool value)
set_syntax_highlighter_for(code_document());
}
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);
}
return {};
}
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);
}
}

4
Userland/DevTools/HackStudio/Editor.h
View file

@ -36,6 +36,8 @@ public:
Vector<size_t> const& breakpoint_lines() const { return code_document().breakpoint_lines(); }
Vector<size_t>& breakpoint_lines() { return code_document().breakpoint_lines(); }
ErrorOr<void> add_breakpoint(size_t line_number);
void remove_breakpoint(size_t line_number);
Optional<size_t> execution_position() const { return code_document().execution_position(); }
bool is_program_running() const { return execution_position().has_value(); }
void set_execution_position(size_t line_number);
@ -120,6 +122,8 @@ private:
RefPtr<Core::Timer> m_tokens_info_timer; // Used for querying language server for syntax highlighting info
OwnPtr<LanguageClient> m_language_client;
bool m_use_semantic_syntax_highlighting { false };
GutterIndicatorID m_breakpoint_indicator_id;
};
}