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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/locator/executefilter.cpp

Change-Id: Iff5b82a9e491b782e4720138904f389d318b005c
This commit is contained in:
Eike Ziller
2021-08-11 10:10:51 +02:00
parent 7be290ec59 21cb0711c4
commit c7168d1063
104 changed files with 1405 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,7 +760,7 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("virtual function call via pointer") << 192 << 33 << 192 << 48
<< QList<int>{C_VIRTUAL_METHOD} << 0;
QTest::newRow("final virtual function call via pointer") << 202 << 38 << 202 << 58
<< QList<int>{C_FUNCTION} << 0;
<< QList<int>{C_VIRTUAL_METHOD} << 0;
QTest::newRow("non-final virtual function call via pointer") << 207 << 41 << 207 << 61
<< QList<int>{C_VIRTUAL_METHOD} << 0;
QTest::newRow("operator+ declaration") << 220 << 18 << 220 << 19
@@ -1299,12 +1299,18 @@ void ClangdTestHighlighting::test()
for (const TextEditor::TextStyle s : result.textStyles.mixinStyles)
actualStyles << s;
}
QEXPECT_FAIL("virtual member function definition outside of class body",
"FIXME: send virtual info in clangd", Continue);
QEXPECT_FAIL("virtual function call via pointer",
"FIXME: send virtual info in clangd", Continue);
QEXPECT_FAIL("non-final virtual function call via pointer",
"FIXME: send virtual info in clangd", Continue);
if (client()->versionNumber() < QVersionNumber(14)) {
QEXPECT_FAIL("final virtual function call via pointer",
"clangd < 14 does not send virtual modifier", Continue);
QEXPECT_FAIL("virtual member function definition outside of class body",
"clangd < 14 does not send virtual modifier", Continue);
QEXPECT_FAIL("virtual function call via pointer",
"clangd < 14 does not send virtual modifier", Continue);
QEXPECT_FAIL("non-final virtual function call via pointer",
"clangd < 14 does not send virtual modifier", Continue);
}
QEXPECT_FAIL("template non-type parameter",
"FIXME: clangd reports non-type template parameters at \"typeParameter\"",
Continue);