Fixed highlighting when word occurs as substring first

(cherry picked from commit 9c0e1524e5)
This commit is contained in:
Paulb23 2016-03-17 20:35:04 +00:00 committed by Rémi Verschelde
parent 68b7f9d87a
commit 1369b38d85
1 changed files with 14 additions and 8 deletions

View File

@ -3198,16 +3198,22 @@ int TextEdit::_get_column_pos_of_word(const String &p_key, const String &p_searc
p_from_column = 0;
}
// match case
col = p_search.findn(p_key, p_from_column);
while (col == -1 && p_from_column <= p_search.length()) {
// match case
col = p_search.findn(p_key, p_from_column);
// whole words only
if (col != -1) {
if (col > 0 && _is_text_char(p_search[col-1])) {
col = -1;
} else if (_is_text_char(p_search[col+p_key.length()])) {
col = -1;
// whole words only
if (col != -1) {
p_from_column=col;
if (col > 0 && _is_text_char(p_search[col-1])) {
col = -1;
} else if (_is_text_char(p_search[col+p_key.length()])) {
col = -1;
}
}
p_from_column+=1;
}
}
return col;