Use the right SendEvent call in server implementations

daviwil · daviwil · commit e54c0913b083 · 2017-01-31T10:33:05.000-08:00
This change fixes broken language and debug server tests by switching to a
different SendEvent implementation which ensures that the event is being
sent from the correct thread.  A true fix will be needed in the future to
ensure that all SendEvent implementations will use the correct thread for
sending event messages.
diff --git a/src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs b/src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs
@@ -91,7 +91,7 @@ protected Task LaunchScript(RequestContext<object> requestContext)
                             // Make sure remaining output is flushed before exiting
                             await this.outputDebouncer.Flush();
 
-                            await requestContext.SendEvent(
+                            await this.SendEvent(
                                 TerminatedEvent.Type,
                                 new TerminatedEvent());
 
@@ -198,7 +198,7 @@ await this.editorSession.PowerShellContext.ExecuteScriptString(
 
             // Send the InitializedEvent so that the debugger will continue
             // sending configuration requests
-            await requestContext.SendEvent(
+            await this.SendEvent(
                 InitializedEvent.Type,
                 null);
         }
diff --git a/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs b/src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs
@@ -232,7 +232,7 @@ private async Task HandleSetPSSARulesRequest(
             await RunScriptDiagnostics(
                     new ScriptFile[] { scripFile },
                         editorSession,
-                        requestContext.SendEvent);
+                        this.SendEvent);
             await sendresult;
         }
 
@@ -1136,7 +1136,7 @@ private Task RunScriptDiagnostics(
             EditorSession editorSession,
             EventContext eventContext)
         {
-            return RunScriptDiagnostics(filesToAnalyze, editorSession, eventContext.SendEvent);
+            return RunScriptDiagnostics(filesToAnalyze, editorSession, this.SendEvent);
         }
 
         private Task RunScriptDiagnostics(

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ private async Task HandleSetPSSARulesRequest(`
`232`	`232`	`await RunScriptDiagnostics(`
`233`	`233`	`new ScriptFile[] { scripFile },`
`234`	`234`	`editorSession,`
`235`		`- requestContext.SendEvent);`
	`235`	`+ this.SendEvent);`
`236`	`236`	`await sendresult;`
`237`	`237`	`}`
`238`	`238`
`@@ -1136,7 +1136,7 @@ private Task RunScriptDiagnostics(`
`1136`	`1136`	`EditorSession editorSession,`
`1137`	`1137`	`EventContext eventContext)`
`1138`	`1138`	`{`
`1139`		`- return RunScriptDiagnostics(filesToAnalyze, editorSession, eventContext.SendEvent);`
	`1139`	`+ return RunScriptDiagnostics(filesToAnalyze, editorSession, this.SendEvent);`
`1140`	`1140`	`}`
`1141`	`1141`
`1142`	`1142`	`private Task RunScriptDiagnostics(`