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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangcodemodelplugin.cpp

Change-Id: Idb3d6e8fdfd278979f6180dc3795a2138bc2e61d
This commit is contained in:
Eike Ziller
2023-02-16 12:27:28 +01:00
parent 227e66b62c 22a6b79f45
commit 4e9309f923
105 changed files with 2390 additions and 1290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/clangcodemodel/clangcodemodelplugin.cpp
View File

@@ -42,8 +42,7 @@ using namespace Core;
using namespace ProjectExplorer;
using namespace Utils;
namespace ClangCodeModel {
namespace Internal {
namespace ClangCodeModel::Internal {
void ClangCodeModelPlugin::generateCompilationDB()
{
@@ -77,11 +76,22 @@ ClangCodeModelPlugin::~ClangCodeModelPlugin()
void ClangCodeModelPlugin::initialize()
{
TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS,
Tr::tr("Clang Code Model"));
TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS, Tr::tr("Clang Code Model"));
CppEditor::CppModelManager::instance()->activateClangCodeModel(
std::make_unique<ClangModelManagerSupport>());
std::make_unique<ClangModelManagerSupport>());
createCompilationDBAction();
#ifdef WITH_TESTS
addTest<Tests::ActivationSequenceProcessorTest>();
addTest<Tests::ClangdTestCompletion>();
addTest<Tests::ClangdTestExternalChanges>();
addTest<Tests::ClangdTestFindReferences>();
addTest<Tests::ClangdTestFollowSymbol>();
addTest<Tests::ClangdTestHighlighting>();
addTest<Tests::ClangdTestLocalReferences>();
addTest<Tests::ClangdTestTooltips>();
addTest<Tests::ClangFixItTest>();
#endif
}
void ClangCodeModelPlugin::createCompilationDBAction()
@@ -158,22 +168,4 @@ void ClangCodeModelPlugin::createCompilationDBAction()
});
}
#ifdef WITH_TESTS
QVector<QObject *> ClangCodeModelPlugin::createTestObjects() const
{
return {
new Tests::ActivationSequenceProcessorTest,
new Tests::ClangdTestCompletion,
new Tests::ClangdTestExternalChanges,
new Tests::ClangdTestFindReferences,
new Tests::ClangdTestFollowSymbol,
new Tests::ClangdTestHighlighting,
new Tests::ClangdTestLocalReferences,
new Tests::ClangdTestTooltips,
new Tests::ClangFixItTest,
};
}
#endif
} // namespace Internal
} // namespace Clang
} // namespace ClangCodeModel::Internal