diff options
| author | David Schulz <david.schulz@qt.io> | 2023-05-09 14:08:41 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2023-05-11 05:53:49 +0000 |
| commit | 5b0c3258bb56fb4de71c28340857761641fe9aa7 (patch) | |
| tree | f03eeb3eb04b86f5e37123fd88c46e218e1ca87d /src/libs | |
| parent | edeea10e6a4aa2eeec50f6974495099520a66a47 (diff) | |
| download | qt-creator-5b0c3258bb56fb4de71c28340857761641fe9aa7.tar.gz | |
Utils: Make column of LineColumn consistently 0-based
Change-Id: I4ab153d1c55653936efbcdc13ac04463185930e0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/linecolumn.h | 4 | ||||
| -rw-r--r-- | src/libs/utils/textutils.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/utils/linecolumn.h b/src/libs/utils/linecolumn.h index 78a881d7f4..457ebd6a51 100644 --- a/src/libs/utils/linecolumn.h +++ b/src/libs/utils/linecolumn.h @@ -19,7 +19,7 @@ public: bool isValid() const { - return line >= 0 && column >= 0; + return line > 0 && column >= 0; } friend bool operator==(LineColumn first, LineColumn second) @@ -35,7 +35,7 @@ public: static LineColumn extractFromFileName(QStringView fileName, int &postfixPos); public: - int line = -1; + int line = 0; int column = -1; }; diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index ec440a8902..8b52d51d2c 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -60,7 +60,7 @@ OptionalLineColumn convertPosition(const QTextDocument *document, int pos) QTextBlock block = document->findBlock(pos); if (block.isValid()) - optional.emplace(block.blockNumber() + 1, pos - block.position() + 1); + optional.emplace(block.blockNumber() + 1, pos - block.position()); return optional; } @@ -180,8 +180,7 @@ LineColumn utf16LineColumn(const QByteArray &utf8Buffer, int utf8Offset) : 0; lineColumn.column = QString::fromUtf8( utf8Buffer.mid(startOfLineOffset, utf8Offset - startOfLineOffset)) - .length() - + 1; + .length(); return lineColumn; } |