diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-03-06 13:04:34 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2019-03-06 13:57:46 +0000 |
| commit | 6b5b5692e4693f929fbbd78fa4f1b889f4857899 (patch) | |
| tree | 4d26eff683e3181946e4e2b1f9713804fee031a7 /src/libs | |
| parent | 70661a57f05937ee4cc6bd3d0de36097598e9f38 (diff) | |
ClangFormat: Fix UTF-16 line and column for 0 offset
Change-Id: I348a32d623da1c2da7f3e7f18cad8c9c06dc7b06
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/textutils.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index 0d8009fef8..ba10ca56ae 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -171,7 +171,8 @@ LineColumn utf16LineColumn(const QByteArray &utf8Buffer, int utf8Offset) lineColumn.line = static_cast<int>( std::count(utf8Buffer.begin(), utf8Buffer.begin() + utf8Offset, '\n')) + 1; - const int startOfLineOffset = utf8Buffer.lastIndexOf('\n', utf8Offset - 1) + 1; + const int startOfLineOffset = utf8Offset ? (utf8Buffer.lastIndexOf('\n', utf8Offset - 1) + 1) + : 0; lineColumn.column = QString::fromUtf8( utf8Buffer.mid(startOfLineOffset, utf8Offset - startOfLineOffset)) .length() @@ -181,7 +182,9 @@ LineColumn utf16LineColumn(const QByteArray &utf8Buffer, int utf8Offset) QString utf16LineTextInUtf8Buffer(const QByteArray &utf8Buffer, int currentUtf8Offset) { - const int lineStartUtf8Offset = utf8Buffer.lastIndexOf('\n', currentUtf8Offset - 1) + 1; + const int lineStartUtf8Offset = currentUtf8Offset + ? (utf8Buffer.lastIndexOf('\n', currentUtf8Offset - 1) + 1) + : 0; const int lineEndUtf8Offset = utf8Buffer.indexOf('\n', currentUtf8Offset); return QString::fromUtf8( utf8Buffer.mid(lineStartUtf8Offset, lineEndUtf8Offset - lineStartUtf8Offset)); |