diff --git a/src/plugins/languageclient/clientrequesttask.cpp b/src/plugins/languageclient/clientrequesttask.cpp index c5503bd6947..ed3ddaff2c5 100644 --- a/src/plugins/languageclient/clientrequesttask.cpp +++ b/src/plugins/languageclient/clientrequesttask.cpp @@ -9,21 +9,21 @@ using namespace LanguageServerProtocol; namespace LanguageClient { -ClientRequestTaskAdapter::ClientRequestTaskAdapter() +WorkspaceSymbolRequestTaskAdapter::WorkspaceSymbolRequestTaskAdapter() { task()->setResponseCallback([this](const WorkspaceSymbolRequest::Response &response){ emit done(response.result().has_value()); }); } -void ClientRequestTaskAdapter::start() +void WorkspaceSymbolRequestTaskAdapter::start() { task()->start(); } bool WorkspaceSymbolRequestTask::preStartCheck() { - if (!ClientRequestTask::preStartCheck() || !client()->locatorsEnabled()) + if (!ClientRequestTask::preStartCheck()) return false; const std::optional> capability diff --git a/src/plugins/languageclient/clientrequesttask.h b/src/plugins/languageclient/clientrequesttask.h index c2de15e7007..dc14d5bf2ff 100644 --- a/src/plugins/languageclient/clientrequesttask.h +++ b/src/plugins/languageclient/clientrequesttask.h @@ -31,7 +31,7 @@ public: void start() { - QTC_ASSERT(isRunning(), return); + QTC_ASSERT(!isRunning(), return); QTC_ASSERT(preStartCheck(), m_callback({}); return); Request request(m_params); @@ -65,14 +65,14 @@ public: bool preStartCheck() override; }; -class LANGUAGECLIENT_EXPORT ClientRequestTaskAdapter +class LANGUAGECLIENT_EXPORT WorkspaceSymbolRequestTaskAdapter : public Utils::Tasking::TaskAdapter { public: - ClientRequestTaskAdapter(); + WorkspaceSymbolRequestTaskAdapter(); void start() final; }; } // namespace LanguageClient -QTC_DECLARE_CUSTOM_TASK(WorkspaceSymbolRequest, LanguageClient::WorkspaceSymbolRequestTask); +QTC_DECLARE_CUSTOM_TASK(SymbolRequest, LanguageClient::WorkspaceSymbolRequestTaskAdapter);