Clang: make workaround for multibyte utf8

Correct columns in clang diagnostics and completion

Task-number: QTCREATORBUG-16775
Change-Id: I7260a0e52007fe261e83492dca5d457c34476497
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-05-19 08:55:08 +02:00
parent 34702f8441
commit 707170ca04
4 changed files with 34 additions and 4 deletions

View File

@@ -552,7 +552,8 @@ bool ClangCompletionAssistProcessor::sendCompletionRequest(int position,
{
int line, column;
TextEditor::Convenience::convertPosition(m_interface->textDocument(), position, &line, &column);
++column;
const QTextBlock block = m_interface->textDocument()->findBlock(position);
column += ClangCodeModel::Utils::extraUtf8CharsShift(block.text(), column) + 1;
const QString filePath = m_interface->fileName();