Ian Huff (IanMatthewHuff) · Feb 6, 2020 · Feb 5, 2020 · Feb 5, 2020 · Rich Chiodo (rchiodo) · Feb 5, 2020
diff --git a/news/2 Fixes/9926.md b/news/2 Fixes/9926.md
@@ -0,0 +1 @@
+Use the autoStart server when available.
diff --git a/src/client/datascience/jupyter/liveshare/serverCache.ts b/src/client/datascience/jupyter/liveshare/serverCache.ts
@@ -17,6 +17,7 @@ interface IServerData {
     options: INotebookServerOptions;
     promise: Promise<INotebookServer | undefined>;
     cancelSource: CancellationTokenSource;
+    resolved: boolean;
 }
 
 export class ServerCache implements IAsyncDisposable {
@@ -43,7 +44,7 @@ export class ServerCache implements IAsyncDisposable {
 
         // See if the old options had the same UI setting. If not,
         // cancel the old
-        if (data && data.options.disableUI !== fixedOptions.disableUI) {
+        if (data && !data.resolved && data.options.disableUI !== fixedOptions.disableUI) {
             traceInfo('Cancelling server create as UI state has changed');
             data.cancelSource.cancel();
             data = undefined;
@@ -55,7 +56,8 @@ export class ServerCache implements IAsyncDisposable {
             data = {
                 promise: createFunction(options, cancelSource.token),
                 options: fixedOptions,
-                cancelSource
+                cancelSource,
+                resolved: false
             };
             this.cache.set(key, data);
         }
@@ -75,6 +77,11 @@ export class ServerCache implements IAsyncDisposable {
                     return oldDispose();
                 };
 
+                // We've resolved the promise at this point
+                if (data) {
+                    data.resolved = true;
+                }
+
                 return server;
             })
             .catch(e => {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use the autoStart server when available.
Rich Chiodo (rchiodo) Feb 5, 2020 Copy link Copy Markdown Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Don't forget to update the changelog Ian Huff (IanMatthewHuff) Feb 5, 2020 Copy link Copy Markdown Member Author Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Rich Chiodo (@rchiodo) . Did we change the process? I didn't do this on previous release ports, thought that it was generated by running 'news' task as part of the final release plan. Rich Chiodo (rchiodo) Feb 5, 2020 Copy link Copy Markdown Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I think other people have started running the task during their port? Karthik Nadig (@karthiknadig) should we update the changelog when porting fixes? Rich Chiodo (rchiodo) Feb 5, 2020 Copy link Copy Markdown Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. It looks like that's what David did here: https://github.com/microsoft/vscode-python/pull/9912/files Ian Huff (IanMatthewHuff) Feb 5, 2020 Copy link Copy Markdown Member Author Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Hmm, guess I can do that. Seems like that would mess up the cherry-pick since that has the news file in it. But I could just delete that as well. Ian Huff (IanMatthewHuff) Feb 5, 2020 Copy link Copy Markdown Member Author Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Via Karthik it sounds like we can do either. But I was already updating the CL, so I just went ahead with it.