feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: fix utf8 related column numbers

Browse Source 
Use new clang_getFileContents to efficiently convert
utf8 byte offsets from line start to column numbers.
Also provide simplier backwards convertion to pass
resulting utf8 offset to clang.

Task-number: QTCREATORBUG-16941
Change-Id: If0e58fe01ad3e281b7e952e972b9e86f6e75aadb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-11-29 16:08:06 +01:00
parent 6deec195f1
commit 09310bcdc6
26 changed files with 106 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/clangbackend/source/clangfollowsymbol.cpp
View File

@@ -107,7 +107,7 @@ static SourceRange getOperatorRange(const CXTranslationUnit tu,
++operatorIndex;
}
const CXSourceLocation end = clang_getTokenLocation(tu, tokens.data[operatorIndex]);
return SourceRange(clang_getRange(start, end));
return SourceRange(tu, clang_getRange(start, end));
}
static SourceRangeContainer extractMatchingTokenRange(const Cursor &cursor,
@@ -128,7 +128,7 @@ static SourceRangeContainer extractMatchingTokenRange(const Cursor &cursor,
continue;
}
}
return SourceRange(clang_getTokenExtent(tu, tokens.data[i]));
return SourceRange(tu, clang_getTokenExtent(tu, tokens.data[i]));
}
return SourceRangeContainer();
}
@@ -137,7 +137,7 @@ static int getTokenIndex(CXTranslationUnit tu, const Tokens &tokens, uint line,
{
int tokenIndex = -1;
for (int i = static_cast<int>(tokens.tokenCount - 1); i >= 0; --i) {
const SourceRange range = clang_getTokenExtent(tu, tokens.data[i]);
const SourceRange range(tu, clang_getTokenExtent(tu, tokens.data[i]));
if (range.contains(line, column)) {
tokenIndex = i;
break;