iteration 2

ivanbasov · ivanbasov · commit 9973ba043a39 · 2018-05-11T12:25:21.000-07:00
diff --git a/src/Interactive/Features/Interactive/Core/InteractiveHost.RemoteService.cs b/src/Interactive/Features/Interactive/Core/InteractiveHost.RemoteService.cs
@@ -74,9 +74,11 @@ private async void ProcessExitedHandler(object _, EventArgs __)
                             _processExitHandlerStatus = ProcessExitHandlerStatus.Handled;
                             // Should set _processExitHandlerStatus before calling OnProcessExited to avoid deadlocks.
                             // Calling the host should be within the lock to prevent its disposing during the execution.
-                            await _host.OnProcessExited(Process).ConfigureAwait(false);
+                            _host.ReportProcessExited(Process);
                         }
                     }
+
+                    await _host.TryGetOrCreateRemoteServiceAsync(processPendingOutput: true).ConfigureAwait(false);
                 }
                 catch (Exception e) when (FatalError.Report(e))
                 {
diff --git a/src/Interactive/Features/Interactive/Core/InteractiveHost.cs b/src/Interactive/Features/Interactive/Core/InteractiveHost.cs
@@ -300,12 +300,6 @@ private LazyRemoteService CreateRemoteService(InteractiveHostOptions options, bo
             return new LazyRemoteService(this, options, Interlocked.Increment(ref _remoteServiceInstanceId), skipInitialization);
         }
 
-        private Task OnProcessExited(Process process)
-        {
-            ReportProcessExited(process);
-            return TryGetOrCreateRemoteServiceAsync(processPendingOutput: true);
-        }
-
         private void ReportProcessExited(Process process)
         {
             int? exitCode;

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,11 @@ private async void ProcessExitedHandler(object _, EventArgs __)`
`74`	`74`	`_processExitHandlerStatus = ProcessExitHandlerStatus.Handled;`
`75`	`75`	`// Should set _processExitHandlerStatus before calling OnProcessExited to avoid deadlocks.`
`76`	`76`	`// Calling the host should be within the lock to prevent its disposing during the execution.`
`77`		`- await _host.OnProcessExited(Process).ConfigureAwait(false);`
	`77`	`+ _host.ReportProcessExited(Process);`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ await _host.TryGetOrCreateRemoteServiceAsync(processPendingOutput: true).ConfigureAwait(false);`
`80`	`82`	`}`
`81`	`83`	`catch (Exception e) when (FatalError.Report(e))`
`82`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -300,12 +300,6 @@ private LazyRemoteService CreateRemoteService(InteractiveHostOptions options, bo`
`300`	`300`	`return new LazyRemoteService(this, options, Interlocked.Increment(ref _remoteServiceInstanceId), skipInitialization);`
`301`	`301`	`}`
`302`	`302`
`303`		`- private Task OnProcessExited(Process process)`
`304`		`- {`
`305`		`- ReportProcessExited(process);`
`306`		`- return TryGetOrCreateRemoteServiceAsync(processPendingOutput: true);`
`307`		`- }`
`308`		`-`
`309`	`303`	`private void ReportProcessExited(Process process)`
`310`	`304`	`{`
`311`	`305`	`int? exitCode;`