asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #37447 from ThakeeNathees/text-replace-empty-string-fix

Browse source 
replace selected text with empty string bug fixed
This commit is contained in:
Rémi Verschelde 2020-04-06 11:28:42 +02:00 committed by GitHub
commit e14464caeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editor/code_editor.cpp
View file

@ -226,6 +226,10 @@ void FindReplaceBar::_replace_all() {
text_edit->begin_complex_operation(); text_edit->begin_complex_operation();
if (selection_enabled && is_selection_only()) {
text_edit->cursor_set_line(selection_begin.width);
text_edit->cursor_set_column(selection_begin.height);
}
if (search_current()) { if (search_current()) {
do { do {
// replace area // replace area
@ -243,7 +247,7 @@ void FindReplaceBar::_replace_all() {
if (selection_enabled && is_selection_only()) { if (selection_enabled && is_selection_only()) {
if (match_from < selection_begin || match_to > selection_end) { if (match_from < selection_begin || match_to > selection_end) {
continue; break; // Done.
} }
// Replace but adjust selection bounds. // Replace but adjust selection bounds.
@ -289,6 +293,10 @@ void FindReplaceBar::_get_search_from(int &r_line, int &r_col) {
r_line = text_edit->cursor_get_line(); r_line = text_edit->cursor_get_line();
r_col = text_edit->cursor_get_column(); r_col = text_edit->cursor_get_column();
if (text_edit->is_selection_active() && is_selection_only()) {
return;
}
if (r_line == result_line && r_col >= result_col && r_col <= result_col + get_search_text().length()) { if (r_line == result_line && r_col >= result_col && r_col <= result_col + get_search_text().length()) {
r_col = result_col; r_col = result_col;
} }