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

ClangCodeModel: Let users configure the clangd index location

Browse Source 
Fixes: QTCREATORBUG-27346
Change-Id: I9bc59f759682e70b761c0f22a011868008fc0360
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2024-02-08 15:00:55 +01:00
parent 7a055a2f0a
commit 1af555ad09
5 changed files with 122 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
#include <utils/algorithm.h>
#include <utils/async.h>
#include <utils/infobar.h>
#include <utils/macroexpander.h>
#include <utils/qtcassert.h>
#include <QApplication>
@@ -472,17 +473,15 @@ void ClangModelManagerSupport::connectToWidgetsMarkContextMenuRequested(QWidget
}
}
static FilePath getJsonDbDir(const Project *project)
static FilePath getJsonDbDir(Project *project)
{
static const QString dirName(".qtc_clangd");
if (!project) {
const QString sessionDirName = FileUtils::fileSystemFriendlyName(
SessionManager::activeSession());
return ICore::userResourcePath() / dirName / sessionDirName; // TODO: Make configurable?
}
if (const Target * const target = project->activeTarget()) {
if (const BuildConfiguration * const bc = target->activeBuildConfiguration())
return bc->buildDirectory() / dirName;
if (!project)
return ClangdSettings::instance().sessionIndexPath(*globalMacroExpander());
if (const Target *const target = project->activeTarget()) {
if (const BuildConfiguration *const bc = target->activeBuildConfiguration()) {
return ClangdSettings(ClangdProjectSettings(project).settings())
.projectIndexPath(*bc->macroExpander());
}
}
return {};
}
@@ -696,7 +695,7 @@ ClangdClient *ClangModelManagerSupport::clientWithProject(const Project *project
void ClangModelManagerSupport::updateStaleIndexEntries()
{
QHash<FilePath, QDateTime> lastModifiedCache;
for (const Project * const project : ProjectManager::projects()) {
for (Project * const project : ProjectManager::projects()) {
const FilePath jsonDbDir = getJsonDbDir(project);
if (jsonDbDir.isEmpty())
continue;