diff options
author | Maganty Rushyendra <mrushyendra@yahoo.com.sg> | 2020-06-15 11:39:36 +0800 |
---|---|---|
committer | Maganty Rushyendra <mrushyendra@yahoo.com.sg> | 2020-06-15 11:39:36 +0800 |
commit | 91bdc77d47eba2a0c74c07eb57ce5ee14538b535 (patch) | |
tree | f98711ce392864a27a3a72f71a560d396f12ac42 | |
parent | 6fa2a5ac145054a29268735316f14d2afe46b381 (diff) |
Fix match count for whole word search in editor
Check if a match borders a new line char when incrementing match counts.
-rw-r--r-- | editor/code_editor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 1b2b0a26e6..95c7cc0bf1 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -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; } } |