From 8469e317c9c02bc9760a69ecadb79f396a541eb8 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Fri, 2 Nov 2018 14:17:12 +0100 Subject: 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 --- src/plugins/cpptools/cppelementevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cppelementevaluator.cpp') diff --git a/src/plugins/cpptools/cppelementevaluator.cpp b/src/plugins/cpptools/cppelementevaluator.cpp index 90fb21a34c..afd8944bde 100644 --- a/src/plugins/cpptools/cppelementevaluator.cpp +++ b/src/plugins/cpptools/cppelementevaluator.cpp @@ -373,7 +373,7 @@ void CppElementEvaluator::execute() // Fetch the expression's code ExpressionUnderCursor expressionUnderCursor(doc->languageFeatures()); const QString &expression = expressionUnderCursor(m_tc); - Scope *scope = doc->scopeAt(line, column); + Scope *scope = doc->scopeAt(line, column - 1); TypeOfExpression typeOfExpression; typeOfExpression.init(doc, snapshot); -- cgit v1.2.1