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

ClangCodeModel: Factor out clangd compilation db update

Browse Source 
We want to re-use that code.

Change-Id: I9b9201b63ef4c375c24efa402c80769634287714
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-02-16 12:26:15 +01:00
parent 33eef06f64
commit 4cd18fb3a4
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -1327,6 +1327,33 @@ private:
} }
}; };
static void addToCompilationDb(QJsonObject &cdb,
const CppEditor::ClangDiagnosticConfig &projectWarnings,
const QStringList &projectOptions,
const CppEditor::ProjectPart::ConstPtr &projectPart,
const Utils::FilePath &workingDir,
const Utils::FilePath &sourceFile)
{
// TODO: Do we really need to re-calculate the project part options per source file?
QStringList args = createClangOptions(*projectPart, sourceFile.toString(),
projectWarnings, projectOptions);
// TODO: clangd seems to apply some heuristics depending on what we put here.
// Should we make use of them or keep using our own?
args.prepend("clang");
args.append(sourceFile.toUserOutput());
QJsonObject value;
value.insert("workingDirectory", workingDir.toString());
value.insert("compilationCommand", QJsonArray::fromStringList(args));
cdb.insert(sourceFile.toUserOutput(), value);
}
static void addCompilationDb(QJsonObject &parentObject, const QJsonObject &cdb)
{
parentObject.insert("compilationDatabaseChanges", cdb);
}
ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir) ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir)
: Client(clientInterface(project, jsonDbDir)), d(new Private(this, project)) : Client(clientInterface(project, jsonDbDir)), d(new Private(this, project))
{ {
@@ -1717,18 +1744,11 @@ void ClangdClient::updateParserConfig(const Utils::FilePath &filePath,
->projectPartForId(config.preferredProjectPartId); ->projectPartForId(config.preferredProjectPartId);
if (!projectPart) if (!projectPart)
return; return;
const CppEditor::ClangDiagnosticConfig projectWarnings = warningsConfigForProject(project());
const QStringList projectOptions = optionsForProject(project());
QJsonObject cdbChanges; QJsonObject cdbChanges;
QStringList args = createClangOptions(*projectPart, filePath.toString(), projectWarnings, addToCompilationDb(cdbChanges, warningsConfigForProject(project()),
projectOptions); optionsForProject(project()), projectPart, filePath.parentDir(), filePath);
args.prepend("clang"); QJsonObject settings;
args.append(filePath.toString()); addCompilationDb(settings, cdbChanges);
QJsonObject value;
value.insert("workingDirectory", filePath.parentDir().toString());
value.insert("compilationCommand", QJsonArray::fromStringList(args));
cdbChanges.insert(filePath.toUserOutput(), value);
const QJsonObject settings({qMakePair(QString("compilationDatabaseChanges"), cdbChanges)});
DidChangeConfigurationParams configChangeParams; DidChangeConfigurationParams configChangeParams;
configChangeParams.setSettings(settings); configChangeParams.setSettings(settings);
sendContent(DidChangeConfigurationNotification(configChangeParams)); sendContent(DidChangeConfigurationNotification(configChangeParams));