diff options
-rw-r--r-- | src/libs/utils/textutils.cpp | 5 | ||||
-rw-r--r-- | src/libs/utils/textutils.h | 1 | ||||
-rw-r--r-- | tests/auto/utils/text/tst_text.cpp | 34 |
3 files changed, 40 insertions, 0 deletions
diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index a57e531059..8b17cc7e01 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -59,6 +59,11 @@ Position Position::fromPositionInDocument(const QTextDocument *document, int pos return {}; } +Position Position::fromCursor(const QTextCursor &c) +{ + return c.isNull() ? Position{} : Position{c.blockNumber() + 1, c.positionInBlock()}; +} + int Range::length(const QString &text) const { if (end.line < begin.line) diff --git a/src/libs/utils/textutils.h b/src/libs/utils/textutils.h index df1eb73d8e..96b7afbeb8 100644 --- a/src/libs/utils/textutils.h +++ b/src/libs/utils/textutils.h @@ -32,6 +32,7 @@ public: static Position fromFileName(QStringView fileName, int &postfixPos); static Position fromPositionInDocument(const QTextDocument *document, int pos); + static Position fromCursor(const QTextCursor &cursor); }; class QTCREATOR_UTILS_EXPORT Range diff --git a/tests/auto/utils/text/tst_text.cpp b/tests/auto/utils/text/tst_text.cpp index 3428b0b757..3672eb2ce2 100644 --- a/tests/auto/utils/text/tst_text.cpp +++ b/tests/auto/utils/text/tst_text.cpp @@ -3,6 +3,7 @@ #include <utils/textutils.h> +#include <QTextCursor> #include <QTextDocument> #include <QtTest> @@ -19,6 +20,9 @@ private slots: void testPositionFromPositionInDocument_data(); void testPositionFromPositionInDocument(); + void testPositionFromCursor_data(); + void testPositionFromCursor(); + void testRangeLength_data(); void testRangeLength(); }; @@ -135,6 +139,36 @@ void tst_Text::testPositionFromPositionInDocument() QCOMPARE(Position::fromPositionInDocument(&doc, documentPosition), position); } +void tst_Text::testPositionFromCursor_data() +{ + QTest::addColumn<QString>("text"); + QTest::addColumn<int>("documentPosition"); + QTest::addColumn<Position>("position"); + + QTest::newRow("0") << QString() << 0 << Position{1, 0}; + QTest::newRow("-1") << QString() << -1 << Position{}; + QTest::newRow("mid line") << QString("foo\n") << 1 << Position{1, 1}; + QTest::newRow("second line") << QString("foo\n") << 4 << Position{2, 0}; + QTest::newRow("second mid line") << QString("foo\nbar") << 5 << Position{2, 1}; + QTest::newRow("behind content") << QString("foo\nbar") << 8 << Position{1, 0}; +} + +void tst_Text::testPositionFromCursor() +{ + QFETCH(QString, text); + QFETCH(int, documentPosition); + QFETCH(Position, position); + + if (documentPosition < 0) {// test invalid Cursor { + QCOMPARE(Position::fromCursor(QTextCursor()), position); + } else { + QTextDocument doc(text); + QTextCursor cursor(&doc); + cursor.setPosition(documentPosition); + QCOMPARE(Position::fromCursor(cursor), position); + } +} + void tst_Text::testRangeLength_data() { QTest::addColumn<QString>("text"); |