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

clangd: update current document filter after initialize

Browse Source 
This makes sure that the lsp filter gets enabled if a document is opened
before the corresponding clangd server was initialized. This happens
when loading a session with an open document.

Change-Id: I7987ea60c6fca8b5c070af3a7bcd5325667ed0c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-05-02 07:02:30 +02:00
parent b09e2b77c4
commit 7826012443
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "clangcompletioncontextanalyzer.h" #include "clangcompletioncontextanalyzer.h"
#include "clangconstants.h" #include "clangconstants.h"
#include "clangdlocatorfilters.h"
#include "clangdqpropertyhighlighter.h" #include "clangdqpropertyhighlighter.h"
#include "clangmodelmanagersupport.h" #include "clangmodelmanagersupport.h"
#include "clangpreprocessorassistproposalitem.h" #include "clangpreprocessorassistproposalitem.h"
@@ -1558,6 +1559,9 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir)
}); });
connect(this, &Client::initialized, this, [this] { connect(this, &Client::initialized, this, [this] {
auto currentDocumentFilter = static_cast<ClangdCurrentDocumentFilter *>(
CppEditor::CppModelManager::instance()->currentDocumentFilter());
currentDocumentFilter->updateCurrentClient();
// If we get this signal while there are pending searches, it means that // If we get this signal while there are pending searches, it means that
// the client was re-initialized, i.e. clangd crashed. // the client was re-initialized, i.e. clangd crashed.

5
src/plugins/clangcodemodel/clangdlocatorfilters.cpp
View File

@@ -287,6 +287,11 @@ ClangdCurrentDocumentFilter::ClangdCurrentDocumentFilter() : d(new Private)
ClangdCurrentDocumentFilter::~ClangdCurrentDocumentFilter() { delete d; } ClangdCurrentDocumentFilter::~ClangdCurrentDocumentFilter() { delete d; }
void ClangdCurrentDocumentFilter::updateCurrentClient()
{
d->lspFilter.updateCurrentClient();
}
void ClangdCurrentDocumentFilter::prepareSearch(const QString &entry) void ClangdCurrentDocumentFilter::prepareSearch(const QString &entry)
{ {
const auto doc = TextEditor::TextDocument::currentTextDocument(); const auto doc = TextEditor::TextDocument::currentTextDocument();

2
src/plugins/clangcodemodel/clangdlocatorfilters.h
View File

@@ -66,6 +66,8 @@ public:
ClangdCurrentDocumentFilter(); ClangdCurrentDocumentFilter();
~ClangdCurrentDocumentFilter() override; ~ClangdCurrentDocumentFilter() override;
void updateCurrentClient();
private: private:
void prepareSearch(const QString &entry) override; void prepareSearch(const QString &entry) override;
QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,