diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-11-02 14:17:12 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-11-09 08:51:21 +0000 |
| commit | 8469e317c9c02bc9760a69ecadb79f396a541eb8 (patch) | |
| tree | f640379bc065daa8dcf876cf4eb0e311ed8db188 /src/plugins/cpptools/builtincursorinfo.cpp | |
| parent | 3d939458408d0d61d8f9b05e9b5caec4bc7a6c1b (diff) | |
| download | qt-creator-8469e317c9c02bc9760a69ecadb79f396a541eb8.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cpptools/builtincursorinfo.cpp')
| -rw-r--r-- | src/plugins/cpptools/builtincursorinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/builtincursorinfo.cpp b/src/plugins/cpptools/builtincursorinfo.cpp index 4522af15a9..85603ba090 100644 --- a/src/plugins/cpptools/builtincursorinfo.cpp +++ b/src/plugins/cpptools/builtincursorinfo.cpp @@ -184,8 +184,9 @@ private: { CursorInfo result; + // findLocalUses operates with 1-based line and 0-based column const CppTools::SemanticInfo::LocalUseMap localUses - = BuiltinCursorInfo::findLocalUses(m_document, m_line, m_column); + = BuiltinCursorInfo::findLocalUses(m_document, m_line, m_column - 1); result.localUses = localUses; splitLocalUses(localUses, &result.useRanges, &result.unusedVariablesRanges); @@ -216,8 +217,7 @@ private: bool good = false; foreach (const CppTools::SemanticInfo::Use &use, uses) { unsigned l = static_cast<unsigned>(m_line); - // convertCursorPosition() returns a 0-based column number. - unsigned c = static_cast<unsigned>(m_column + 1); + unsigned c = static_cast<unsigned>(m_column); if (l == use.line && c >= use.column && c <= (use.column + use.length)) { good = true; break; |