LanguageClient: Rename ClientRequestTask -> ClientRequest

Make naming consistent.

Fixes: QTCREATORBUG-29102
Change-Id: I215cdc524168df2783497a56c7daf87563db716d
Reviewed-by: David Schulz <[email protected]>

3 files changed, 16 insertions, 15 deletions

diff --git a/src/plugins/languageclient/clientrequesttask.cpp b/src/plugins/languageclient/clientrequesttask.cpp
index 6da5be5704c..31635b3fc34 100644
--- a/src/plugins/languageclient/clientrequesttask.cpp
+++ b/src/plugins/languageclient/clientrequesttask.cpp
@@ -7,21 +7,21 @@ using namespace LanguageServerProtocol;
 
 namespace LanguageClient {
 
-WorkspaceSymbolRequestTaskAdapter::WorkspaceSymbolRequestTaskAdapter()
+ClientWorkspaceSymbolRequestTaskAdapter::ClientWorkspaceSymbolRequestTaskAdapter()
 {
     task()->setResponseCallback([this](const WorkspaceSymbolRequest::Response &response){
         emit done(response.result().has_value());
     });
 }
 
-void WorkspaceSymbolRequestTaskAdapter::start()
+void ClientWorkspaceSymbolRequestTaskAdapter::start()
 {
     task()->start();
 }
 
-bool WorkspaceSymbolRequestTask::preStartCheck()
+bool ClientWorkspaceSymbolRequest::preStartCheck()
 {
-    if (!ClientRequestTask::preStartCheck())
+    if (!ClientRequest::preStartCheck())
         return false;
 
     const std::optional<std::variant<bool, WorkDoneProgressOptions>> capability
diff --git a/src/plugins/languageclient/clientrequesttask.h b/src/plugins/languageclient/clientrequesttask.h
index 92e72427a39..d1ed3161741 100644
--- a/src/plugins/languageclient/clientrequesttask.h
+++ b/src/plugins/languageclient/clientrequesttask.h
@@ -16,10 +16,10 @@
 namespace LanguageClient {
 
 template <typename Request>
-class LANGUAGECLIENT_EXPORT ClientRequestTask
+class LANGUAGECLIENT_EXPORT ClientRequest
 {
 public:
-    virtual ~ClientRequestTask()
+    virtual ~ClientRequest()
     {
         if (m_id)
             m_client->cancelRequest(*m_id); // In order to not to invoke a response callback anymore
@@ -60,21 +60,22 @@ private:
     typename Request::Response m_response;
 };
 
-class LANGUAGECLIENT_EXPORT WorkspaceSymbolRequestTask
-    : public ClientRequestTask<LanguageServerProtocol::WorkspaceSymbolRequest>
+class LANGUAGECLIENT_EXPORT ClientWorkspaceSymbolRequest
+    : public ClientRequest<LanguageServerProtocol::WorkspaceSymbolRequest>
 {
 public:
     bool preStartCheck() override;
 };
 
-class LANGUAGECLIENT_EXPORT WorkspaceSymbolRequestTaskAdapter
-    : public Tasking::TaskAdapter<WorkspaceSymbolRequestTask>
+class LANGUAGECLIENT_EXPORT ClientWorkspaceSymbolRequestTaskAdapter
+    : public Tasking::TaskAdapter<ClientWorkspaceSymbolRequest>
 {
 public:
-    WorkspaceSymbolRequestTaskAdapter();
+    ClientWorkspaceSymbolRequestTaskAdapter();
     void start() final;
 };
 
-using SymbolRequest = Tasking::CustomTask<WorkspaceSymbolRequestTaskAdapter>;
+using ClientWorkspaceSymbolRequestTask
+    = Tasking::CustomTask<ClientWorkspaceSymbolRequestTaskAdapter>;
 
 } // namespace LanguageClient
diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp
index 61a6d187daa..9909e0e6c4d 100644
--- a/src/plugins/languageclient/locatorfilter.cpp
+++ b/src/plugins/languageclient/locatorfilter.cpp
@@ -51,7 +51,7 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount,
     TreeStorage<LocatorStorage> storage;
     TreeStorage<QList<SymbolInformation>> resultStorage;
 
-    const auto onQuerySetup = [storage, client, maxResultCount](WorkspaceSymbolRequestTask &request) {
+    const auto onQuerySetup = [storage, client, maxResultCount](ClientWorkspaceSymbolRequest &request) {
         request.setClient(client);
         WorkspaceSymbolParams params;
         params.setQuery(storage->input());
@@ -59,7 +59,7 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount,
             params.setLimit(maxResultCount);
         request.setParams(params);
     };
-    const auto onQueryDone = [resultStorage](const WorkspaceSymbolRequestTask &request) {
+    const auto onQueryDone = [resultStorage](const ClientWorkspaceSymbolRequest &request) {
         const std::optional<LanguageClientArray<SymbolInformation>> result
             = request.response().result();
         if (result.has_value())
@@ -77,7 +77,7 @@ LocatorMatcherTask locatorMatcher(Client *client, int maxResultCount,
 
     const Group root {
         Storage(resultStorage),
-        SymbolRequest(onQuerySetup, onQueryDone),
+        ClientWorkspaceSymbolRequestTask(onQuerySetup, onQueryDone),
         AsyncTask<void>(onFilterSetup)
     };
     return {root, storage};