Cherry-pick 26a7b9c

Author: rchiodo

news/2 Fixes/4853.md

@@ -0,0 +1 @@
+Fix status bar when using Live Share or just starting the Python Interactive window.

package.nls.json

@@ -157,6 +157,7 @@
     "DataScience.liveShareSyncFailure": "Synchronization failure during live share startup.",
     "DataScience.liveShareServiceFailure": "Failure starting '{0}' service during live share connection.",
     "DataScience.documentMismatch": "Cannot run cells, duplicate documents for {0} found.",
+    "DataScience.pythonInteractiveCreateFailed": "Failure to create a 'Python Interactive' window. Try reinstalling the Python extension.",
     "diagnostics.warnSourceMaps": "Source map support is enabled in the Python Extension, this will adversely impact performance of the extension.",
     "diagnostics.disableSourceMaps": "Disable Source Map Support",
     "diagnostics.warnBeforeEnablingSourceMaps": "Enabling source map support in the Python Extension will adversely impact performance of the extension.",

src/client/common/utils/localize.ts

@@ -142,6 +142,8 @@ export namespace DataScience {
     export const liveShareServiceFailure = localize('DataScience.liveShareServiceFailure', 'Failure starting \'{0}\' service during live share connection.');
     export const documentMismatch = localize('DataScience.documentMismatch', 'Cannot run cells, duplicate documents for {0} found.');
     export const jupyterGetVariablesBadResults = localize('DataScience.jupyterGetVariablesBadResults', 'Failed to fetch variable info from the Jupyter server.');
+    export const pythonInteractiveCreateFailed = localize('DataScience.pythonInteractiveCreateFailed', 'Failure to create a \'Python Interactive\' window. Try reinstalling the Python extension.');
+
 }
 
 export namespace DebugConfigurationPrompts {

src/client/datascience/historyProvider.ts

@@ -9,6 +9,7 @@ import * as vsls from 'vsls/vscode';
 import { ILiveShareApi, IWorkspaceService } from '../common/application/types';
 import { IAsyncDisposable, IAsyncDisposableRegistry, IConfigurationService, IDisposableRegistry } from '../common/types';
 import { createDeferred, Deferred } from '../common/utils/async';
+import * as localize from '../common/utils/localize';
 import { IServiceContainer } from '../ioc/types';
 import { Identifiers, LiveShare, LiveShareCommands, Settings } from './constants';
 import { PostOffice } from './liveshare/postOffice';
@@ -64,14 +65,18 @@ export class HistoryProvider implements IHistoryProvider, IAsyncDisposable {
 
     public async getOrCreateActive() : Promise<IHistory> {
         if (!this.activeHistory) {
-            this.activeHistory = await this.create();
+            await this.create();
         }
 
         // Make sure all other providers have an active history.
         await this.synchronizeCreate();
 
         // Now that all of our peers have sync'd, return the history to use.
-        return this.activeHistory;
+        if (this.activeHistory) {
+            return this.activeHistory;
+        }
+
+        throw new Error(localize.DataScience.pythonInteractiveCreateFailed());
     }
 
     public async getNotebookOptions() : Promise<INotebookServerOptions> {
@@ -107,15 +112,16 @@ export class HistoryProvider implements IHistoryProvider, IAsyncDisposable {
         return this.postOffice.dispose();
     }
 
-    private async create() : Promise<IHistory> {
-        const result = this.serviceContainer.get<IHistory>(IHistory);
-        const handler = result.closed(this.onHistoryClosed);
-        this.disposables.push(result);
+    private async create() : Promise<void> {
+        // Set it as soon as we create it. The .ctor for the history window
+        // may cause a subclass to talk to the IHistoryProvider to get the active history.
+        this.activeHistory = this.serviceContainer.get<IHistory>(IHistory);
+        const handler = this.activeHistory.closed(this.onHistoryClosed);
+        this.disposables.push(this.activeHistory);
         this.disposables.push(handler);
-        this.activeHistoryExecuteHandler = result.onExecutedCode(this.onHistoryExecute);
+        this.activeHistoryExecuteHandler = this.activeHistory.onExecutedCode(this.onHistoryExecute);
         this.disposables.push(this.activeHistoryExecuteHandler);
-        await result.ready;
-        return result;
+        await this.activeHistory.ready;
     }
 
     private onPeerCountChanged(newCount: number) {
@@ -133,7 +139,7 @@ export class HistoryProvider implements IHistoryProvider, IAsyncDisposable {
             // The other side is creating a history window. Create on this side. We don't need to show
             // it as the running of new code should do that.
             if (!this.activeHistory) {
-                this.activeHistory = await this.create();
+                await this.create();
             }
 
             // Tell the requestor that we got its message (it should be waiting for all peers to sync)

src/test/datascience/liveshare.functional.test.tsx

@@ -144,15 +144,14 @@ suite('LiveShare tests', () => {
         // The history provider create needs to be rewritten to make the history window think the mounted web panel is
         // ready.
         const origFunc = (historyProvider as any).create.bind(historyProvider);
-        (historyProvider as any).create = async (): Promise<IHistory> => {
-            const createResult = await origFunc();
+        (historyProvider as any).create = async (): Promise<void> => {
+            await origFunc();
+            const history = historyProvider.getActive();
 
             // During testing the MainPanel sends the init message before our history is created.
             // Pretend like it's happening now
-            const listener = ((createResult as any)['messageListener']) as HistoryMessageListener;
+            const listener = ((history as any).messageListener) as HistoryMessageListener;
             listener.onMessage(HistoryMessages.Started, {});
-
-            return createResult;
         };
 
         return result;