diff options
author | Jarek Kobus <[email protected]> | 2023-04-06 16:03:18 +0200 |
---|---|---|
committer | Jarek Kobus <[email protected]> | 2023-04-11 08:14:57 +0000 |
commit | 205fb14a43e9545b9e46b5019427454d9c947264 (patch) | |
tree | 7e4fbe38c9561a2e8efeca6b8d6b715ae0cacb47 /src/plugins/languageclient/clientrequesttask.cpp | |
parent | 25f7dfac25e8dd3f73ed5d189e2975843e808439 (diff) |
ClientRequestTask: A few fixes
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 8e9b8933256c1483f1f72ade010ea879550d40d7
Change-Id: I7cef290e18d5d86b48aa17d548a058bf35fd31ec
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/languageclient/clientrequesttask.cpp')
-rw-r--r-- | src/plugins/languageclient/clientrequesttask.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<std::variant<bool, WorkDoneProgressOptions>> capability |