LSP: simplify request response type

Instead of always defining the templates of the response type by hand
add a using construct in the Request where all the template types are
known.

Change-Id: I0dc00bd9aef9c37c9454e35aca200a30fcf2ebda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

4 files changed, 4 insertions, 9 deletions

diff --git a/src/libs/languageserverprotocol/initializemessages.h b/src/libs/languageserverprotocol/initializemessages.h
index 1a2268b0cc2..2a923179b87 100644
--- a/src/libs/languageserverprotocol/initializemessages.h
+++ b/src/libs/languageserverprotocol/initializemessages.h
@@ -176,6 +176,4 @@ public:
     constexpr static const char methodName[] = "initialize";
 };
 
-using InitializeResponse = Response<InitializeResult, InitializeError>;
-
 } // namespace LanguageClient
diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h
index 864e74a1c1c..d0229a93d1f 100644
--- a/src/libs/languageserverprotocol/jsonrpcmessages.h
+++ b/src/libs/languageserverprotocol/jsonrpcmessages.h
@@ -245,7 +245,8 @@ public:
     void setId(const MessageId &id)
     { JsonRpcMessage::m_jsonObject.insert(idKey, id.toJson()); }
 
-    using ResponseCallback = std::function<void(Response<Result, Error>)>;
+    using Response = LanguageServerProtocol::Response<Result, Error>;
+    using ResponseCallback = std::function<void(Response)>;
     void setResponseCallback(const ResponseCallback &callback)
     { m_callBack = callback; }
 
@@ -258,13 +259,13 @@ public:
             QString parseError;
             const QJsonObject &object =
                     JsonRpcMessageHandler::toJsonObject(content, codec, parseError);
-            Response<Result, Error> response(object);
+            Response response(object);
             if (object.isEmpty()) {
                 ResponseError<Error> error;
                 error.setMessage(parseError);
                 response.setError(ResponseError<Error>());
             }
-            callback(Response<Result, Error>(object));
+            callback(Response(object));
         });
     }
 
diff --git a/src/libs/languageserverprotocol/messages.h b/src/libs/languageserverprotocol/messages.h
index 3a3aaa52a5d..904f78d3eeb 100644
--- a/src/libs/languageserverprotocol/messages.h
+++ b/src/libs/languageserverprotocol/messages.h
@@ -95,8 +95,6 @@ public:
     constexpr static const char methodName[] = "window/showMessageRequest";
 };
 
-using ShowMessageResponse = Response<LanguageClientValue<MessageActionItem>, LanguageClientNull>;
-
 using LogMessageParams = ShowMessageParams;
 
 class LANGUAGESERVERPROTOCOL_EXPORT LogMessageNotification : public Notification<LogMessageParams>
diff --git a/src/libs/languageserverprotocol/shutdownmessages.h b/src/libs/languageserverprotocol/shutdownmessages.h
index 04efe868abe..57bc2d3bea2 100644
--- a/src/libs/languageserverprotocol/shutdownmessages.h
+++ b/src/libs/languageserverprotocol/shutdownmessages.h
@@ -29,8 +29,6 @@
 
 namespace LanguageServerProtocol {
 
-using ShutdownResponse = Response<LanguageClientNull, LanguageClientNull>;
-
 class LANGUAGESERVERPROTOCOL_EXPORT ShutdownRequest : public Request<
         LanguageClientNull, LanguageClientNull, LanguageClientNull>
 {