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

ClangCodeModel: Fix check for whether clangd should be used

Browse Source 
Change-Id: I789c12b1b4098e6f11f190cf1ada6de9429c6101
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-05-11 15:27:09 +02:00
parent 2be4e8c5d5
commit e0ab8ad258
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -299,8 +299,8 @@ void ClangModelManagerSupport::connectToWidgetsMarkContextMenuRequested(QWidget
void ClangModelManagerSupport::updateLanguageClient( void ClangModelManagerSupport::updateLanguageClient(
ProjectExplorer::Project *project, const CppEditor::ProjectInfo::ConstPtr &projectInfo) ProjectExplorer::Project *project, const CppEditor::ProjectInfo::ConstPtr &projectInfo)
{ {
const ClangdSettings::Data clangdSettingsData = ClangdProjectSettings(project).settings(); const ClangdSettings settings(ClangdProjectSettings(project).settings());
if (!clangdSettingsData.useClangd) if (!settings.useClangd())
return; return;
const auto getJsonDbDir = [project] { const auto getJsonDbDir = [project] {
if (const ProjectExplorer::Target * const target = project->activeTarget()) { if (const ProjectExplorer::Target * const target = project->activeTarget()) {
@@ -321,7 +321,7 @@ void ClangModelManagerSupport::updateLanguageClient(
generatorWatcher->deleteLater(); generatorWatcher->deleteLater();
if (!ProjectExplorer::SessionManager::hasProject(project)) if (!ProjectExplorer::SessionManager::hasProject(project))
return; return;
if (!CppEditor::ClangdProjectSettings(project).settings().useClangd) if (!ClangdSettings(ClangdProjectSettings(project).settings()).useClangd())
return; return;
const CppEditor::ProjectInfo::ConstPtr newProjectInfo const CppEditor::ProjectInfo::ConstPtr newProjectInfo
= cppModelManager()->projectInfo(project); = cppModelManager()->projectInfo(project);
@@ -409,7 +409,7 @@ void ClangModelManagerSupport::updateLanguageClient(
}); });
}); });
const Utils::FilePath includeDir = ClangdSettings(clangdSettingsData).clangdIncludePath(); const Utils::FilePath includeDir = settings.clangdIncludePath();
const ClangDiagnosticConfig warningsConfig = warningsConfigForProject(project); const ClangDiagnosticConfig warningsConfig = warningsConfigForProject(project);
auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo, jsonDbDir, auto future = Utils::runAsync(&Internal::generateCompilationDB, projectInfo, jsonDbDir,
CompilationDbPurpose::CodeModel, CompilationDbPurpose::CodeModel,