Fixed refactoring when the cursor is at the end of a symbol.

Reviewed by: Roberto Raggi
(cherry picked from commit 5852cc805d68f21ed0ac34191bb1e3f3002e9b4d)

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index eeda79c9e1..68885add66 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -831,9 +831,13 @@ CPlusPlus::Symbol *CPPEditor::findCanonicalSymbol(const QTextCursor &cursor,
     QTextCursor tc = cursor;
     int line, col;
     convertPosition(tc.position(), &line, &col);
-    ++col;
+    ++col; // 1-based line and 1-based column
 
-    tc.movePosition(QTextCursor::EndOfWord);
+    int pos = tc.position();
+    while (document()->characterAt(pos).isLetterOrNumber() ||
+           document()->characterAt(pos) == QLatin1Char('_'))
+        ++pos;
+    tc.setPosition(pos);
 
     ExpressionUnderCursor expressionUnderCursor;
     const QString code = expressionUnderCursor(tc);