godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Merge pull request #39552 from mrushyendra/whole_word_match_count

Browse Source 
Fix match count for whole word search in editor
This commit is contained in:
Rémi Verschelde
2020-06-15 07:13:20 +02:00
committed by GitHub
parent 6fa2a5ac14 91bdc77d47
commit fe858b74b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/code_editor.cpp
View File

@@ -307,18 +307,19 @@ void FindReplaceBar::_update_results_count() {
break;
}
int pos_subsequent = pos + searched.length();
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.
if (pos > 0 && !is_symbol(full_text[pos - 1])) {
if (pos > 0 && !(is_symbol(full_text[pos - 1]) || full_text[pos - 1] == '\n')) {
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;
}
}
results_count++;
from_pos = pos + searched.length();
from_pos = pos_subsequent;
}
}