From 1369b38d85b7669674eca450ae6933fed2caf277 Mon Sep 17 00:00:00 2001 From: Paulb23 Date: Thu, 17 Mar 2016 20:35:04 +0000 Subject: [PATCH] Fixed highlighting when word occurs as substring first (cherry picked from commit 9c0e1524e56a3d38bf5ab281939770e806ac24e9) --- scene/gui/text_edit.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index be3792ad7ea..6ab142c0f57 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -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;