Merge pull request #69 from PowerShell/daviwil/fix-debug-hang

Fix hang when debug adapter finishes executing

Author: daviwil

.gitignore

@@ -24,7 +24,7 @@ lock
 /target
 .corext/gen
 registered_data.ini
-
+.vs/
 
 # quickbuild.exe
 /VersionGeneratingLogs/

appveyor.yml

@@ -36,5 +36,5 @@ build:
 test:
   assemblies:
   - Microsoft.PowerShell.EditorServices.Test.dll
+  - Microsoft.PowerShell.EditorServices.Test.Protocol.dll
   - Microsoft.PowerShell.EditorServices.Test.Host.dll
-  - Microsoft.PowerShell.EditorServices.Test.Transport.Stdio.dll

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -56,6 +56,17 @@ protected override void Initialize()
             this.SetRequestHandler(EvaluateRequest.Type, this.HandleEvaluateRequest);
         }
 
+        protected override void Shutdown()
+        {
+            Logger.Write(LogLevel.Normal, "Debug adapter is shutting down...");
+
+            if (this.editorSession != null)
+            {
+                this.editorSession.Dispose();
+                this.editorSession = null;
+            }
+        }
+
         #region Built-in Message Handlers
 
         protected async Task HandleLaunchRequest(

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -70,7 +70,11 @@ protected override void Shutdown()
         {
             Logger.Write(LogLevel.Normal, "Language service is shutting down...");
 
-            this.editorSession.Dispose();
+            if (this.editorSession != null)
+            {
+                this.editorSession.Dispose();
+                this.editorSession = null;
+            }
         }
 
         #region Built-in Message Handlers

test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj

@@ -84,6 +84,9 @@
     <None Include="TestFiles\SimpleSyntaxError.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

test/PowerShellEditorServices.Test.Host/xunit.runner.json

@@ -0,0 +1,4 @@
+{
+  "parallelizeTestCollections": false,
+  "methodDisplay": "method"
+}

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -61,11 +61,7 @@ void debugService_BreakpointUpdated(object sender, BreakpointUpdatedEventArgs e)
 
         void debugService_DebuggerStopped(object sender, DebuggerStopEventArgs e)
         {
-            this.runnerContext.Post(
-                (o) =>
-                {
-                    this.debuggerStoppedQueue.Enqueue(e);
-                }, null);
+            this.debuggerStoppedQueue.Enqueue(e);
         }
 
         public void Dispose()
@@ -119,7 +115,6 @@ await this.debugService.SetBreakpoints(
             this.debugService.Continue();
 
             await this.AssertDebuggerStopped(this.debugScriptFile.FilePath, 9);
-            this.debugService.Continue();
 
             // Abort script execution early and wait for completion
             this.debugService.Abort();

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

@@ -87,6 +87,9 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
+    <None Include="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj">

test/PowerShellEditorServices.Test/xunit.runner.json

@@ -0,0 +1,4 @@
+{
+  "parallelizeTestCollections": false,
+  "methodDisplay": "method"
+}