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

ClientRequestTask: A few fixes

Browse Source 
1. Rename ClientRequestTaskAdapter into
   WorkspaceSymbolRequestTaskAdapter as it's adapting
   the WorkspaceSymbolRequestTask, not the general
   ClientRequestTask.
2. Rename the registered name inside Tasking namespace
   into SymbolRequest, as WorkspaceSymbolRequest
   may collide with the class defined inside workspace.h
   header. We also aim for rather short names inside
   Tasking namespace in order to not to be too verbose.
3. Register the adapter with QTC_DECLARE_CUSTOM_TASK,
   not the task itself.
4. Fix isRunning() assert inside start().
5. Drop check for Client::locatorsEnabled() inside
   preStartCheck(), as that's being done beforehand
   when needed.

Amends 8e9b893325

Change-Id: I7cef290e18d5d86b48aa17d548a058bf35fd31ec
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2023-04-06 16:03:18 +02:00
parent 25f7dfac25
commit 205fb14a43
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/languageclient/clientrequesttask.cpp
View File

@@ -9,21 +9,21 @@ using namespace LanguageServerProtocol;
namespace LanguageClient { namespace LanguageClient {
ClientRequestTaskAdapter::ClientRequestTaskAdapter() WorkspaceSymbolRequestTaskAdapter::WorkspaceSymbolRequestTaskAdapter()
{ {
task()->setResponseCallback([this](const WorkspaceSymbolRequest::Response &response){ task()->setResponseCallback([this](const WorkspaceSymbolRequest::Response &response){
emit done(response.result().has_value()); emit done(response.result().has_value());
}); });
} }
void ClientRequestTaskAdapter::start() void WorkspaceSymbolRequestTaskAdapter::start()
{ {
task()->start(); task()->start();
} }
bool WorkspaceSymbolRequestTask::preStartCheck() bool WorkspaceSymbolRequestTask::preStartCheck()
{ {
if (!ClientRequestTask::preStartCheck() || !client()->locatorsEnabled()) if (!ClientRequestTask::preStartCheck())
return false; return false;
const std::optional<std::variant<bool, WorkDoneProgressOptions>> capability const std::optional<std::variant<bool, WorkDoneProgressOptions>> capability

8
src/plugins/languageclient/clientrequesttask.h
View File

@@ -31,7 +31,7 @@ public:
void start() void start()
{ {
QTC_ASSERT(isRunning(), return); QTC_ASSERT(!isRunning(), return);
QTC_ASSERT(preStartCheck(), m_callback({}); return); QTC_ASSERT(preStartCheck(), m_callback({}); return);
Request request(m_params); Request request(m_params);
@@ -65,14 +65,14 @@ public:
bool preStartCheck() override; bool preStartCheck() override;
}; };
class LANGUAGECLIENT_EXPORT ClientRequestTaskAdapter class LANGUAGECLIENT_EXPORT WorkspaceSymbolRequestTaskAdapter
: public Utils::Tasking::TaskAdapter<WorkspaceSymbolRequestTask> : public Utils::Tasking::TaskAdapter<WorkspaceSymbolRequestTask>
{ {
public: public:
ClientRequestTaskAdapter(); WorkspaceSymbolRequestTaskAdapter();
void start() final; void start() final;
}; };
} // namespace LanguageClient } // namespace LanguageClient
QTC_DECLARE_CUSTOM_TASK(WorkspaceSymbolRequest, LanguageClient::WorkspaceSymbolRequestTask); QTC_DECLARE_CUSTOM_TASK(SymbolRequest, LanguageClient::WorkspaceSymbolRequestTaskAdapter);