RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:47:35 +00:00
Code Issues Activity Actions

TextEditor: Add button to match regular expression during search

Browse source
This commit is contained in:
Emanuel Sprung 2020-04-23 20:29:38 +02:00 • committed by Andreas Kling
parent 4a630d4b63
commit 3b7884ee8a
8 changed files with 176 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/TextEditor/CMakeLists.txt
View file

@ -7,4 +7,4 @@ set(SOURCES
)
serenity_bin(TextEditor)
target_link_libraries(TextEditor LibWeb LibMarkdown LibGUI LibShell LibDesktop)
target_link_libraries(TextEditor LibWeb LibMarkdown LibGUI LibShell LibRegex LibDesktop)

40
Applications/TextEditor/TextEditorWidget.cpp
View file

@ -117,8 +117,12 @@ TextEditorWidget::TextEditorWidget()
dbgln("find_next(\"\")");
return;
}
auto found_range = m_editor->document().find_next(needle, m_editor->normalized_selection().end());
dbgln("find_next(\"{}\") returned {}", needle, found_range);
if (m_find_use_regex)
m_editor->document().update_regex_matches(needle);
auto found_range = m_editor->document().find_next(needle, m_editor->normalized_selection().end(), GUI::TextDocument::SearchShouldWrap::Yes, m_find_use_regex);
dbg() << "find_next(\"" << needle << "\") returned " << found_range;
if (found_range.is_valid()) {
m_editor->set_selection(found_range);
} else {
@ -129,7 +133,12 @@ TextEditorWidget::TextEditorWidget()
}
});
m_find_previous_action = GUI::Action::create("Find previous", { Mod_Ctrl | Mod_Shift, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find-previous.png"), [&](auto&) {
m_find_regex_action = GUI::Action::create("Find regex", { Mod_Ctrl, Key_R }, [&](auto&) {
m_find_regex_button->set_checked(!m_find_regex_button->is_checked());
m_find_use_regex = m_find_regex_button->is_checked();
});
m_find_previous_action = GUI::Action::create("Find previous", { Mod_Ctrl | Mod_Shift, Key_G }, [&](auto&) {
auto needle = m_find_textbox->text();
if (needle.is_empty()) {
dbgln("find_prev(\"\")");
@ -140,7 +149,10 @@ TextEditorWidget::TextEditorWidget()
if (!selection_start.is_valid())
selection_start = m_editor->normalized_selection().end();
auto found_range = m_editor->document().find_previous(needle, selection_start);
if (m_find_use_regex)
m_editor->document().update_regex_matches(needle);
auto found_range = m_editor->document().find_previous(needle, selection_start, GUI::TextDocument::SearchShouldWrap::Yes, m_find_use_regex);
dbgln("find_prev(\"{}\") returned {}", needle, found_range);
if (found_range.is_valid()) {
@ -164,7 +176,10 @@ TextEditorWidget::TextEditorWidget()
if (!selection_start.is_valid())
selection_start = m_editor->normalized_selection().start();
auto found_range = m_editor->document().find_next(needle, selection_start);
if (m_find_use_regex)
m_editor->document().update_regex_matches(needle);
auto found_range = m_editor->document().find_next(needle, selection_start, GUI::TextDocument::SearchShouldWrap::Yes, m_find_use_regex);
if (found_range.is_valid()) {
m_editor->set_selection(found_range);
@ -187,6 +202,9 @@ TextEditorWidget::TextEditorWidget()
if (!selection_start.is_valid())
selection_start = m_editor->normalized_selection().start();
if (m_find_use_regex)
m_editor->document().update_regex_matches(needle);
auto found_range = m_editor->document().find_previous(needle, selection_start);
if (found_range.is_valid()) {
@ -205,12 +223,14 @@ TextEditorWidget::TextEditorWidget()
auto substitute = m_replace_textbox->text();
if (needle.is_empty())
return;
if (m_find_use_regex)
m_editor->document().update_regex_matches(needle);
auto found_range = m_editor->document().find_next(needle);
auto found_range = m_editor->document().find_next(needle, {}, GUI::TextDocument::SearchShouldWrap::Yes, m_find_use_regex);
while (found_range.is_valid()) {
m_editor->set_selection(found_range);
m_editor->insert_at_cursor_or_replace_selection(substitute);
found_range = m_editor->document().find_next(needle);
found_range = m_editor->document().find_next(needle, {}, GUI::TextDocument::SearchShouldWrap::Yes, m_find_use_regex);
}
});
@ -224,6 +244,11 @@ TextEditorWidget::TextEditorWidget()
m_find_next_button->click();
};
m_find_regex_button = m_find_widget->add<GUI::Button>(".*");
m_find_regex_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
m_find_regex_button->set_preferred_size(20, 0);
m_find_regex_button->set_action(*m_find_regex_action);
m_find_textbox->on_escape_pressed = [this] {
m_find_replace_widget->set_visible(false);
m_editor->set_focus(true);
@ -358,6 +383,7 @@ TextEditorWidget::TextEditorWidget()
edit_menu.add_separator();
edit_menu.add_action(*m_find_replace_action);
edit_menu.add_action(*m_find_next_action);
edit_menu.add_action(*m_find_regex_action);
edit_menu.add_action(*m_find_previous_action);
edit_menu.add_action(*m_replace_next_action);
edit_menu.add_action(*m_replace_previous_action);

3
Applications/TextEditor/TextEditorWidget.h
View file

@ -77,6 +77,7 @@ private:
RefPtr<GUI::Action> m_line_wrapping_setting_action;
RefPtr<GUI::Action> m_find_next_action;
RefPtr<GUI::Action> m_find_regex_action;
RefPtr<GUI::Action> m_find_previous_action;
RefPtr<GUI::Action> m_replace_next_action;
RefPtr<GUI::Action> m_replace_previous_action;
@ -93,6 +94,7 @@ private:
RefPtr<GUI::TextBox> m_replace_textbox;
RefPtr<GUI::Button> m_find_previous_button;
RefPtr<GUI::Button> m_find_next_button;
RefPtr<GUI::Button> m_find_regex_button;
RefPtr<GUI::Button> m_replace_previous_button;
RefPtr<GUI::Button> m_replace_next_button;
RefPtr<GUI::Button> m_replace_all_button;
@ -114,6 +116,7 @@ private:
bool m_document_dirty { false };
bool m_document_opening { false };
bool m_auto_detect_preview_mode { false };
bool m_find_use_regex { false };
PreviewMode m_preview_mode { PreviewMode::None };
};