godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code editor Replace tool to work with 'Selection Only' option 

Ensures that when the `Selection Only` option is selected, the Replace
tool replaces occurrences of the search phrase only within the selected
region, and in order of occurrence.

(cherry picked from commit 2be3a33cc3)
This commit is contained in:
Maganty Rushyendra 2020-06-16 20:04:36 +08:00 committed by Rémi Verschelde
parent 7971b20ebe
commit 3b52ea4b43
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
editor/code_editor.cpp
View File

@ -180,21 +180,47 @@ bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col)
} }
void FindReplaceBar::_replace() { void FindReplaceBar::_replace() {
bool selection_enabled = text_edit->is_selection_active();
if (result_line != -1 && result_col != -1) { Point2i selection_begin, selection_end;
text_edit->begin_complex_operation(); if (selection_enabled) {
selection_begin = Point2i(text_edit->get_selection_from_line(), text_edit->get_selection_from_column());
text_edit->unfold_line(result_line); selection_end = Point2i(text_edit->get_selection_to_line(), text_edit->get_selection_to_column());
text_edit->select(result_line, result_col, result_line, result_col + get_search_text().length());
text_edit->insert_text_at_cursor(get_replace_text());
text_edit->end_complex_operation();
results_count = -1;
} }
if (!search_current()) { String replace_text = get_replace_text();
search_next(); int search_text_len = get_search_text().length();
text_edit->begin_complex_operation();
if (selection_enabled && is_selection_only()) { // To restrict search_current() to selected region
text_edit->cursor_set_line(selection_begin.width);
text_edit->cursor_set_column(selection_begin.height);
}
if (search_current()) {
text_edit->unfold_line(result_line);
text_edit->select(result_line, result_col, result_line, result_col + search_text_len);
if (selection_enabled && is_selection_only()) {
Point2i match_from(result_line, result_col);
Point2i match_to(result_line, result_col + search_text_len);
if (!(match_from < selection_begin || match_to > selection_end)) {
text_edit->insert_text_at_cursor(replace_text);
if (match_to.x == selection_end.x) { // Adjust selection bounds if necessary
selection_end.y += replace_text.length() - search_text_len;
}
}
} else {
text_edit->insert_text_at_cursor(replace_text);
}
}
text_edit->end_complex_operation();
results_count = -1;
if (selection_enabled && is_selection_only()) {
// Reselect in order to keep 'Replace' restricted to selection
text_edit->select(selection_begin.x, selection_begin.y, selection_end.x, selection_end.y);
} else {
text_edit->deselect();
} }
} }