Upgrade language server protocol to v3.2.0

PowerShellEditorServices.build.ps1

@@ -18,7 +18,7 @@ if ($PSVersionTable.PSEdition -ne "Core") {
     Add-Type -Assembly System.IO.Compression.FileSystem
 }
 
-task SetupDotNet -Before Restore, Clean, Build, Test, TestPowerShellApi, PackageNuGet {
+task SetupDotNet -Before Restore, Clean, Build, TestHost, TestServer, TestProtocol, TestPowerShellApi, PackageNuGet {
 
     $requiredSdkVersion = "1.0.0"
 
@@ -157,9 +157,17 @@ function UploadTestLogs {
     }
 }
 
-task Test -If { !$script:IsUnix } {
+task Test TestServer,TestProtocol,TestHost
+
+task TestServer -If { !$script:IsUnix } {
     exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj }
+}
+
+task TestProtocol -If { !$script:IsUnix} {
     exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj }
+}
+
+task TestHost -If { !$script:IsUnix} {
     exec { & $script:dotnetExe test -c $Configuration -f net452 .\test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj }
 }
 

src/PowerShellEditorServices.Protocol/Client/LanguageClientBase.cs

@@ -34,7 +34,7 @@ protected override Task OnStart()
         protected override async Task OnStop()
         {
             // First, notify the language server that we're stopping
-            var response = await this.SendRequest(ShutdownRequest.Type, new object());
+            var response = await this.SendRequest<object, object, object>(ShutdownRequest.Type);
             await this.SendEvent(ExitNotification.Type, new object());
         }
 

src/PowerShellEditorServices.Protocol/Client/LanguageServiceClient.cs

@@ -15,7 +15,7 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.Client
 {
     public class LanguageServiceClient : LanguageClientBase
     {
-        private Dictionary<string, ScriptFileMarker[]> cachedDiagnostics = 
+        private Dictionary<string, ScriptFileMarker[]> cachedDiagnostics =
             new Dictionary<string, ScriptFileMarker[]>();
 
         public LanguageServiceClient(ChannelBase clientChannel)
@@ -34,15 +34,15 @@ protected override Task Initialize()
         protected override Task OnConnect()
         {
             // Send the 'initialize' request and wait for the response
-            var initializeRequest = new InitializeRequest
+            var initializeParams = new InitializeParams
             {
                 RootPath = "",
                 Capabilities = new ClientCapabilities()
             };
 
             return this.SendRequest(
-                InitializeRequest.Type, 
-                initializeRequest);
+                InitializeRequest.Type,
+                initializeParams);
         }
 
         #region Events
@@ -62,7 +62,7 @@ protected void OnDiagnosticsReceived(string filePath)
         #region Private Methods
 
         private Task HandlePublishDiagnosticsEvent(
-            PublishDiagnosticsNotification diagnostics, 
+            PublishDiagnosticsNotification diagnostics,
             EventContext eventContext)
         {
             string normalizedPath = diagnostics.Uri.ToLower();
@@ -79,7 +79,7 @@ private Task HandlePublishDiagnosticsEvent(
 
         private static ScriptFileMarker GetMarkerFromDiagnostic(Diagnostic diagnostic)
         {
-            DiagnosticSeverity severity = 
+            DiagnosticSeverity severity =
                 diagnostic.Severity.GetValueOrDefault(
                     DiagnosticSeverity.Error);
 

src/PowerShellEditorServices.Protocol/DebugAdapter/AttachRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class AttachRequest
     {
         public static readonly
-            RequestType<AttachRequestArguments, object> Type =
-            RequestType<AttachRequestArguments, object>.Create("attach");
+            RequestType<AttachRequestArguments, object, object, object> Type =
+            RequestType<AttachRequestArguments, object, object, object>.Create("attach");
     }
 
     public class AttachRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/ConfigurationDoneRequest.cs

@@ -10,7 +10,7 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class ConfigurationDoneRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("configurationDone");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("configurationDone");
     }
 }

src/PowerShellEditorServices.Protocol/DebugAdapter/ContinueRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class ContinueRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("continue");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("continue");
     }
 }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/ContinuedEvent.cs

@@ -3,15 +3,16 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using System;
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;
 
 namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
 {
     public class ContinuedEvent
     {
         public static readonly
-            EventType<ContinuedEvent> Type =
-            EventType<ContinuedEvent>.Create("continued");
+            NotificationType<ContinuedEvent, object> Type =
+            NotificationType<ContinuedEvent, object>.Create("continued");
 
         public int ThreadId { get; set; }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/DisconnectRequest.cs

@@ -7,11 +7,11 @@
 
 namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
 {
-    public class DisconnectRequest 
+    public class DisconnectRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("disconnect");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("disconnect");
     }
 }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/EvaluateRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class EvaluateRequest
     {
         public static readonly
-            RequestType<EvaluateRequestArguments, EvaluateResponseBody> Type =
-            RequestType<EvaluateRequestArguments, EvaluateResponseBody>.Create("evaluate");
+            RequestType<EvaluateRequestArguments, EvaluateResponseBody, object, object> Type =
+            RequestType<EvaluateRequestArguments, EvaluateResponseBody, object, object>.Create("evaluate");
     }
 
     public class EvaluateRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/ExitedEvent.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class ExitedEvent
     {
         public static readonly
-            EventType<ExitedEventBody> Type =
-            EventType<ExitedEventBody>.Create("exited");
+            NotificationType<ExitedEventBody, object> Type =
+            NotificationType<ExitedEventBody, object>.Create("exited");
     }
 
     public class ExitedEventBody

src/PowerShellEditorServices.Protocol/DebugAdapter/InitializeRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class InitializeRequest
     {
         public static readonly
-            RequestType<InitializeRequestArguments, InitializeResponseBody> Type =
-            RequestType<InitializeRequestArguments, InitializeResponseBody>.Create("initialize");
+            RequestType<InitializeRequestArguments, InitializeResponseBody, object, object> Type =
+            RequestType<InitializeRequestArguments, InitializeResponseBody, object, object>.Create("initialize");
     }
 
     public class InitializeRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/InitializedEvent.cs

@@ -10,7 +10,7 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class InitializedEvent
     {
         public static readonly
-            EventType<object> Type =
-            EventType<object>.Create("initialized");
+            NotificationType<object, object> Type =
+            NotificationType<object, object>.Create("initialized");
     }
 }

src/PowerShellEditorServices.Protocol/DebugAdapter/LaunchRequest.cs

@@ -12,8 +12,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class LaunchRequest
     {
         public static readonly
-            RequestType<LaunchRequestArguments, object> Type =
-            RequestType<LaunchRequestArguments, object>.Create("launch");
+            RequestType<LaunchRequestArguments, object, object, object> Type =
+            RequestType<LaunchRequestArguments, object, object, object>.Create("launch");
     }
 
     public class LaunchRequestArguments
@@ -36,7 +36,7 @@ public class LaunchRequestArguments
         public bool NoDebug { get; set; }
 
         /// <summary>
-        /// Gets or sets a boolean value that determines whether to automatically stop 
+        /// Gets or sets a boolean value that determines whether to automatically stop
         /// target after launch. If not specified, target does not stop.
         /// </summary>
         public bool StopOnEntry { get; set; }
@@ -53,7 +53,7 @@ public class LaunchRequestArguments
         public string Cwd { get; set; }
 
         /// <summary>
-        /// Gets or sets the absolute path to the runtime executable to be used. 
+        /// Gets or sets the absolute path to the runtime executable to be used.
         /// Default is the runtime executable on the PATH.
         /// </summary>
         public string RuntimeExecutable { get; set; }
@@ -64,7 +64,7 @@ public class LaunchRequestArguments
         public string[] RuntimeArgs { get; set; }
 
         /// <summary>
-        /// Gets or sets optional environment variables to pass to the debuggee. The string valued 
+        /// Gets or sets optional environment variables to pass to the debuggee. The string valued
         /// properties of the 'environmentVariables' are used as key/value pairs.
         /// </summary>
         public Dictionary<string, string> Env { get; set; }

src/PowerShellEditorServices.Protocol/DebugAdapter/NextRequest.cs

@@ -13,8 +13,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class NextRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("next");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("next");
     }
 }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/OutputEvent.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class OutputEvent
     {
         public static readonly
-            EventType<OutputEventBody> Type =
-            EventType<OutputEventBody>.Create("output");
+            NotificationType<OutputEventBody, object> Type =
+            NotificationType<OutputEventBody, object>.Create("output");
     }
 
     public class OutputEventBody

src/PowerShellEditorServices.Protocol/DebugAdapter/PauseRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class PauseRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("pause");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("pause");
     }
 }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/ScopesRequest.cs

@@ -11,8 +11,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class ScopesRequest
     {
         public static readonly
-            RequestType<ScopesRequestArguments, ScopesResponseBody> Type =
-            RequestType<ScopesRequestArguments, ScopesResponseBody>.Create("scopes");
+            RequestType<ScopesRequestArguments, ScopesResponseBody, object, object> Type =
+            RequestType<ScopesRequestArguments, ScopesResponseBody, object, object>.Create("scopes");
     }
 
     [DebuggerDisplay("FrameId = {FrameId}")]

src/PowerShellEditorServices.Protocol/DebugAdapter/SetBreakpointsRequest.cs

@@ -16,8 +16,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class SetBreakpointsRequest
     {
         public static readonly
-            RequestType<SetBreakpointsRequestArguments, SetBreakpointsResponseBody> Type =
-            RequestType<SetBreakpointsRequestArguments, SetBreakpointsResponseBody>.Create("setBreakpoints");
+            RequestType<SetBreakpointsRequestArguments, SetBreakpointsResponseBody, object, object> Type =
+            RequestType<SetBreakpointsRequestArguments, SetBreakpointsResponseBody, object, object>.Create("setBreakpoints");
     }
 
     public class SetBreakpointsRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/SetExceptionBreakpointsRequest.cs

@@ -14,8 +14,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class SetExceptionBreakpointsRequest
     {
         public static readonly
-            RequestType<SetExceptionBreakpointsRequestArguments, object> Type =
-            RequestType<SetExceptionBreakpointsRequestArguments, object>.Create("setExceptionBreakpoints");
+            RequestType<SetExceptionBreakpointsRequestArguments, object, object, object> Type =
+            RequestType<SetExceptionBreakpointsRequestArguments, object, object, object>.Create("setExceptionBreakpoints");
     }
 
     /// <summary>

src/PowerShellEditorServices.Protocol/DebugAdapter/SetFunctionBreakpointsRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class SetFunctionBreakpointsRequest
     {
         public static readonly
-            RequestType<SetFunctionBreakpointsRequestArguments, SetBreakpointsResponseBody> Type =
-            RequestType<SetFunctionBreakpointsRequestArguments, SetBreakpointsResponseBody>.Create("setFunctionBreakpoints");
+            RequestType<SetFunctionBreakpointsRequestArguments, SetBreakpointsResponseBody, object, object> Type =
+            RequestType<SetFunctionBreakpointsRequestArguments, SetBreakpointsResponseBody, object, object>.Create("setFunctionBreakpoints");
     }
 
     public class SetFunctionBreakpointsRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/SetVariableRequest.cs

@@ -15,8 +15,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class SetVariableRequest
     {
         public static readonly
-            RequestType<SetVariableRequestArguments, SetVariableResponseBody> Type =
-            RequestType<SetVariableRequestArguments, SetVariableResponseBody>.Create("setVariable");
+            RequestType<SetVariableRequestArguments, SetVariableResponseBody, object, object> Type =
+            RequestType<SetVariableRequestArguments, SetVariableResponseBody, object, object>.Create("setVariable");
     }
 
     [DebuggerDisplay("VariablesReference = {VariablesReference}")]

src/PowerShellEditorServices.Protocol/DebugAdapter/SourceRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class SourceRequest
     {
         public static readonly
-            RequestType<SourceRequestArguments, SourceResponseBody> Type =
-            RequestType<SourceRequestArguments, SourceResponseBody>.Create("source");
+            RequestType<SourceRequestArguments, SourceResponseBody, object, object> Type =
+            RequestType<SourceRequestArguments, SourceResponseBody, object, object>.Create("source");
     }
 
     public class SourceRequestArguments

src/PowerShellEditorServices.Protocol/DebugAdapter/StackTraceRequest.cs

@@ -11,8 +11,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class StackTraceRequest
     {
         public static readonly
-            RequestType<StackTraceRequestArguments, StackTraceResponseBody> Type =
-            RequestType<StackTraceRequestArguments, StackTraceResponseBody>.Create("stackTrace");
+            RequestType<StackTraceRequestArguments, StackTraceResponseBody, object, object> Type =
+            RequestType<StackTraceRequestArguments, StackTraceResponseBody, object, object>.Create("stackTrace");
     }
 
     [DebuggerDisplay("ThreadId = {ThreadId}, Levels = {Levels}")]

src/PowerShellEditorServices.Protocol/DebugAdapter/StartedEvent.cs

@@ -10,7 +10,7 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class StartedEvent
     {
         public static readonly
-            EventType<object> Type =
-            EventType<object>.Create("started");
+            NotificationType<object, object> Type =
+            NotificationType<object, object>.Create("started");
     }
 }

src/PowerShellEditorServices.Protocol/DebugAdapter/StepInRequest.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class StepInRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("stepIn");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("stepIn");
     }
 }
 

src/PowerShellEditorServices.Protocol/DebugAdapter/StepOutRequest.cs

@@ -10,7 +10,7 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class StepOutRequest
     {
         public static readonly
-            RequestType<object, object> Type =
-            RequestType<object, object>.Create("stepOut");
+            RequestType<object, object, object, object> Type =
+            RequestType<object, object, object, object>.Create("stepOut");
     }
 }

src/PowerShellEditorServices.Protocol/DebugAdapter/StoppedEvent.cs

@@ -10,8 +10,8 @@ namespace Microsoft.PowerShell.EditorServices.Protocol.DebugAdapter
     public class StoppedEvent
     {
         public static readonly
-            EventType<StoppedEventBody> Type =
-            EventType<StoppedEventBody>.Create("stopped");
+            NotificationType<StoppedEventBody, object> Type =
+            NotificationType<StoppedEventBody, object>.Create("stopped");
     }
 
     public class StoppedEventBody
@@ -26,7 +26,7 @@ public class StoppedEventBody
         /// </summary>
         public int? ThreadId { get; set; }
 
-        public Source Source { get; set; } 
+        public Source Source { get; set; }
 
         /// <summary>
         /// Gets or sets additional information such as an error message.