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

ClangCodeModel: Fix build

Browse Source 
At least on Apple Clang there is no default constructor
For Text::Position taking two numbers.

Amends 39a448c62e

Change-Id: Ife3630f53d66be38a52ffeb8693bf7574038d083
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2024-06-27 11:05:13 +02:00
parent 1c9563dc18
commit e7d3842f79
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -1656,7 +1656,7 @@ void ClangdTestCompletion::testCompleteGlobals()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(7), " globalFunction() /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(7, 19));
QCOMPARE(manipulator.cursorPos(), Text::Position({7, 19}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1676,7 +1676,7 @@ void ClangdTestCompletion::testCompleteMembers()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(7), " s.member /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(7, 12));
QCOMPARE(manipulator.cursorPos(), Text::Position({7, 12}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1694,7 +1694,7 @@ void ClangdTestCompletion::testCompleteMembersFromInside()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(4), " privateFunc() /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(4, 21));
QCOMPARE(manipulator.cursorPos(), Text::Position({4, 21}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1712,7 +1712,7 @@ void ClangdTestCompletion::testCompleteMembersFromOutside()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(13), " c.publicFunc() /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(13, 18));
QCOMPARE(manipulator.cursorPos(), Text::Position({13, 18}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1730,7 +1730,7 @@ void ClangdTestCompletion::testCompleteMembersFromFriend()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(14), " C().privateFunc() /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(14, 21));
QCOMPARE(manipulator.cursorPos(), Text::Position({14, 21}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1747,7 +1747,7 @@ void ClangdTestCompletion::testFunctionAddress()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(7), " const auto p = &S::memberFunc /* COMPLETE HERE */;");
QCOMPARE(manipulator.cursorPos(), Text::Position(7, 33));
QCOMPARE(manipulator.cursorPos(), Text::Position({7, 33}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1811,7 +1811,7 @@ void ClangdTestCompletion::testCompleteClassAndConstructor()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(7), " Foo( /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(7, 8));
QCOMPARE(manipulator.cursorPos(), Text::Position({7, 8}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1838,7 +1838,7 @@ void ClangdTestCompletion::testCompleteWithDotToArrowCorrection()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(4), " bar->member /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(4, 15));
QCOMPARE(manipulator.cursorPos(), Text::Position({4, 15}));
QCOMPARE(manipulator.skipPos(), -1);
}
@@ -1869,7 +1869,7 @@ void ClangdTestCompletion::testCompleteCodeInGeneratedUiFile()
TextDocumentManipulator manipulator(TextEditorWidget::currentTextEditorWidget());
item->apply(manipulator, cursorPos);
QCOMPARE(manipulator.getLine(34), " ui->setupUi( /* COMPLETE HERE */");
QCOMPARE(manipulator.cursorPos(), Text::Position(34, 16));
QCOMPARE(manipulator.cursorPos(), Text::Position({34, 16}));
QCOMPARE(manipulator.skipPos(), -1);
}