From 5093863b33bb17dc0ca56ecec09ba478a490177b Mon Sep 17 00:00:00 2001
From: Jacob Dufault <jacobdufault@gmail.com>
Date: Tue, 5 Dec 2017 20:08:55 -0800
Subject: [PATCH] Move initialization Ipc structures into messages/

---
 src/command_line.cc        |  2 --
 src/language_server_api.h  | 26 --------------------------
 src/messages/initialize.cc | 28 ++++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/command_line.cc b/src/command_line.cc
index e3530142..bf3c7042 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -86,8 +86,6 @@ void EmitDiagnostics(WorkingFiles* working_files,
 }
 
 REGISTER_IPC_MESSAGE(Ipc_CancelRequest);
-REGISTER_IPC_MESSAGE(Ipc_InitializeRequest);
-REGISTER_IPC_MESSAGE(Ipc_InitializedNotification);
 REGISTER_IPC_MESSAGE(Ipc_Exit);
 REGISTER_IPC_MESSAGE(Ipc_TextDocumentDidOpen);
 REGISTER_IPC_MESSAGE(Ipc_CqueryTextDocumentDidView);
diff --git a/src/language_server_api.h b/src/language_server_api.h
index 402486ba..ce8ed2d6 100644
--- a/src/language_server_api.h
+++ b/src/language_server_api.h
@@ -899,32 +899,6 @@ MAKE_REFLECT_STRUCT(lsServerCapabilities,
                     documentLinkProvider,
                     executeCommandProvider);
 
-struct Ipc_InitializeRequest : public IpcMessage<Ipc_InitializeRequest> {
-  const static IpcId kIpcId = IpcId::Initialize;
-
-  lsRequestId id;
-  lsInitializeParams params;
-};
-MAKE_REFLECT_STRUCT(Ipc_InitializeRequest, id, params);
-
-struct Out_InitializeResponse : public lsOutMessage<Out_InitializeResponse> {
-  struct InitializeResult {
-    lsServerCapabilities capabilities;
-  };
-  lsRequestId id;
-  InitializeResult result;
-};
-MAKE_REFLECT_STRUCT(Out_InitializeResponse::InitializeResult, capabilities);
-MAKE_REFLECT_STRUCT(Out_InitializeResponse, jsonrpc, id, result);
-
-struct Ipc_InitializedNotification
-    : public IpcMessage<Ipc_InitializedNotification> {
-  const static IpcId kIpcId = IpcId::Initialized;
-
-  lsRequestId id;
-};
-MAKE_REFLECT_STRUCT(Ipc_InitializedNotification, id);
-
 struct Ipc_Exit : public IpcMessage<Ipc_Exit> {
   static const IpcId kIpcId = IpcId::Exit;
 };
diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc
index 177a49fc..2f53fcc9 100644
--- a/src/messages/initialize.cc
+++ b/src/messages/initialize.cc
@@ -5,6 +5,34 @@
 
 #include <loguru.hpp>
 
+struct Ipc_InitializeRequest : public IpcMessage<Ipc_InitializeRequest> {
+  const static IpcId kIpcId = IpcId::Initialize;
+
+  lsRequestId id;
+  lsInitializeParams params;
+};
+MAKE_REFLECT_STRUCT(Ipc_InitializeRequest, id, params);
+REGISTER_IPC_MESSAGE(Ipc_InitializeRequest);
+
+struct Out_InitializeResponse : public lsOutMessage<Out_InitializeResponse> {
+  struct InitializeResult {
+    lsServerCapabilities capabilities;
+  };
+  lsRequestId id;
+  InitializeResult result;
+};
+MAKE_REFLECT_STRUCT(Out_InitializeResponse::InitializeResult, capabilities);
+MAKE_REFLECT_STRUCT(Out_InitializeResponse, jsonrpc, id, result);
+
+struct Ipc_InitializedNotification
+    : public IpcMessage<Ipc_InitializedNotification> {
+  const static IpcId kIpcId = IpcId::Initialized;
+
+  lsRequestId id;
+};
+MAKE_REFLECT_STRUCT(Ipc_InitializedNotification, id);
+REGISTER_IPC_MESSAGE(Ipc_InitializedNotification);
+
 struct InitializeHandler : BaseMessageHandler<Ipc_InitializeRequest> {
   void Run(Ipc_InitializeRequest* request) override {
     // Log initialization parameters.