Move MessageDispatcher creation outside of ProtocolEndpoint

This change moves the creation of a MessageDispatcher instance outside
of the ProtocolEndpoint class so that it can be created at a higher
level in the startup code.  The new MessageDispatcher parameter will be
used in an upcoming refactoring.

Author: daviwil

src/PowerShellEditorServices.Protocol/Client/DebugAdapterClientBase.cs

@@ -13,7 +13,10 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.Client
     public class DebugAdapterClient : ProtocolEndpoint
     {
         public DebugAdapterClient(ChannelBase clientChannel)
-            : base(clientChannel, MessageProtocolType.DebugAdapter)
+            : base(
+                clientChannel,
+                new MessageDispatcher(),
+                MessageProtocolType.DebugAdapter)
         {
         }
 

src/PowerShellEditorServices.Protocol/Client/LanguageClientBase.cs

@@ -21,7 +21,10 @@ public abstract class LanguageClientBase : ProtocolEndpoint
         /// </summary>
         /// <param name="clientChannel">The channel to use for communication with the server.</param>
         public LanguageClientBase(ChannelBase clientChannel)
-            : base(clientChannel, MessageProtocolType.LanguageServer)
+            : base(
+                clientChannel,
+                new MessageDispatcher(),
+                MessageProtocolType.LanguageServer)
         {
         }
 

src/PowerShellEditorServices.Protocol/MessageProtocol/ProtocolEndpoint.cs

@@ -57,7 +57,7 @@ private bool InMessageLoopThread
         /// handlers for requests, responses, and events that are
         /// transmitted through the channel.
         /// </summary>
-        protected MessageDispatcher MessageDispatcher { get; set; }
+        private MessageDispatcher MessageDispatcher { get; set; }
 
         /// <summary>
         /// Initializes an instance of the protocol server using the
@@ -71,9 +71,11 @@ private bool InMessageLoopThread
         /// </param>
         public ProtocolEndpoint(
             ChannelBase protocolChannel,
+            MessageDispatcher messageDispatcher,
             MessageProtocolType messageProtocolType)
         {
             this.protocolChannel = protocolChannel;
+            this.MessageDispatcher = messageDispatcher;
             this.messageProtocolType = messageProtocolType;
             this.originalSynchronizationContext = SynchronizationContext.Current;
         }
@@ -89,12 +91,6 @@ public async Task Start()
                 // Start the provided protocol channel
                 this.protocolChannel.Start(this.messageProtocolType);
 
-                // Start the message dispatcher
-                this.MessageDispatcher = new MessageDispatcher(this.protocolChannel);
-
-                // Set the handler for any message responses that come back
-                this.MessageDispatcher.SetResponseHandler(this.HandleResponse);
-
                 // Listen for unhandled exceptions from the message loop
                 this.UnhandledException += MessageDispatcher_UnhandledException;
 

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -41,7 +41,7 @@ public DebugAdapter(
             EditorSession editorSession,
             ChannelBase serverChannel,
             bool ownsEditorSession)
-                : base(serverChannel)
+                : base(serverChannel, new MessageDispatcher())
         {
             this.editorSession = editorSession;
             this.ownsEditorSession = ownsEditorSession;

src/PowerShellEditorServices.Protocol/Server/DebugAdapterBase.cs

@@ -12,8 +12,13 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.Server
 {
     public abstract class DebugAdapterBase : ProtocolEndpoint
     {
-        public DebugAdapterBase(ChannelBase serverChannel)
-            : base (serverChannel, MessageProtocolType.DebugAdapter)
+        public DebugAdapterBase(
+            ChannelBase serverChannel,
+            MessageDispatcher messageDispatcher)
+            : base(
+                serverChannel,
+                messageDispatcher,
+                MessageProtocolType.DebugAdapter)
         {
         }
 

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -51,7 +51,7 @@ public IEditorOperations EditorOperations
         public LanguageServer(
             EditorSession editorSession,
             ChannelBase serverChannel)
-            : base(serverChannel)
+            : base(serverChannel, new MessageDispatcher())
         {
             this.editorSession = editorSession;
             this.editorSession.PowerShellContext.RunspaceChanged += PowerShellContext_RunspaceChanged;

src/PowerShellEditorServices.Protocol/Server/LanguageServerBase.cs

@@ -14,8 +14,13 @@ public abstract class LanguageServerBase : ProtocolEndpoint
     {
         private ChannelBase serverChannel;
 
-        public LanguageServerBase(ChannelBase serverChannel) :
-            base(serverChannel, MessageProtocolType.LanguageServer)
+        public LanguageServerBase(
+            ChannelBase serverChannel,
+            MessageDispatcher messageDispatcher)
+            : base(
+                serverChannel,
+                messageDispatcher,
+                MessageProtocolType.LanguageServer)
         {
             this.serverChannel = serverChannel;
         }