Merge remote-tracking branch 'origin/10.0'

Change-Id: Iff4973fc4116122bcaa7aa9434294dba875ef56a
This commit is contained in:
Orgad Shaneh
2023-02-14 13:08:27 +02:00
303 changed files with 5518 additions and 6428 deletions

View File

@@ -440,9 +440,9 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir, c
setClientCapabilities(caps);
setLocatorsEnabled(false);
setAutoRequestCodeActions(false); // clangd sends code actions inside diagnostics
progressManager()->setTitleForToken(indexingToken(),
project ? tr("Indexing %1 with clangd").arg(project->displayName())
: tr("Indexing session with clangd"));
progressManager()->setTitleForToken(
indexingToken(), project ? Tr::tr("Indexing %1 with clangd").arg(project->displayName())
: Tr::tr("Indexing session with clangd"));
progressManager()->setCancelHandlerForToken(indexingToken(), [this, project]() {
CppEditor::ClangdProjectSettings projectSettings(project);
projectSettings.blockIndexing();