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

Fix match count for whole word search in editor 

Check if a match borders a new line char when incrementing match counts.

(cherry picked from commit 91bdc77d47)
This commit is contained in:
Maganty Rushyendra 2020-06-15 11:39:36 +08:00 committed by Rémi Verschelde
parent 87f999274b
commit ffb423bc76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/code_editor.cpp
View File

@ -319,16 +319,17 @@ void FindReplaceBar::_update_results_count() {
int pos = is_case_sensitive() ? full_text.find(searched, from_pos) : full_text.findn(searched, from_pos); int pos = is_case_sensitive() ? full_text.find(searched, from_pos) : full_text.findn(searched, from_pos);
if (pos == -1) break; if (pos == -1) break;
int pos_subsequent = pos + searched.length();
if (is_whole_words()) { if (is_whole_words()) {
from_pos = pos + 1; // Making sure we won't hit the same match next time, if we get out via a continue. from_pos = pos + 1; // Making sure we won't hit the same match next time, if we get out via a continue.
if (pos > 0 && !is_symbol(full_text[pos - 1])) if (pos > 0 && !(is_symbol(full_text[pos - 1]) || full_text[pos - 1] == '\n'))
continue; continue;
if (pos + searched.length() < full_text.length() && !is_symbol(full_text[pos + searched.length()])) if (pos_subsequent < full_text.length() && !(is_symbol(full_text[pos_subsequent]) || full_text[pos_subsequent] == '\n'))
continue; continue;
} }
results_count++; results_count++;
from_pos = pos + searched.length(); from_pos = pos_subsequent;
} }
} }