Utils: Adjust column numbers affected by convertPosition change

convertPosition change was introduced in 931ec39f64a.
It changed 0-based column to 1-based which is how it
naturally is in Qt Creator.

This fixed some usages but broke many more. This is an
attempt to fix the remaining use cases.

Fixes CppEditor auto-tests.

Change-Id: Ia8d14da0ebb035cd2fdd6da4ff6ec89c1c5121a8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index af4372a458..87bc2df0b4 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1092,7 +1092,7 @@ int InternalCppCompletionAssistProcessor::startCompletionHelper()
     int line = 0, column = 0;
     Utils::Text::convertPosition(m_interface->textDocument(), startOfExpression, &line, &column);
     const QString fileName = m_interface->fileName();
-    return startCompletionInternal(fileName, line, column, expression, endOfExpression);
+    return startCompletionInternal(fileName, line, column - 1, expression, endOfExpression);
 }
 
 bool InternalCppCompletionAssistProcessor::tryObjCCompletion()
@@ -1125,7 +1125,7 @@ bool InternalCppCompletionAssistProcessor::tryObjCCompletion()
     int line = 0, column = 0;
     Utils::Text::convertPosition(m_interface->textDocument(), m_interface->position(), &line,
                                  &column);
-    Scope *scope = thisDocument->scopeAt(line, column);
+    Scope *scope = thisDocument->scopeAt(line, column - 1);
     if (!scope)
         return false;
 
@@ -1319,7 +1319,8 @@ bool InternalCppCompletionAssistProcessor::objcKeywordsWanted() const
 }
 
 int InternalCppCompletionAssistProcessor::startCompletionInternal(const QString &fileName,
-                                                                  unsigned line, unsigned column,
+                                                                  unsigned line,
+                                                                  unsigned positionInBlock,
                                                                   const QString &expr,
                                                                   int endOfExpression)
 {
@@ -1331,7 +1332,7 @@ int InternalCppCompletionAssistProcessor::startCompletionInternal(const QString
 
     m_model->m_typeOfExpression->init(thisDocument, m_interface->snapshot());
 
-    Scope *scope = thisDocument->scopeAt(line, column);
+    Scope *scope = thisDocument->scopeAt(line, positionInBlock);
     QTC_ASSERT(scope != 0, return -1);
 
     if (expression.isEmpty()) {
@@ -2016,7 +2017,7 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q
         int lineSigned = 0, columnSigned = 0;
         Utils::Text::convertPosition(m_interface->textDocument(), m_interface->position(),
                                      &lineSigned, &columnSigned);
-        unsigned line = lineSigned, column = columnSigned;
+        unsigned line = lineSigned, column = columnSigned - 1;
 
         // find a scope that encloses the current location, starting from the lastVisibileSymbol
         // and moving outwards