Fix compilation

DonJayamanne · DonJayamanne · commit b4997d69ccee · 2020-03-10T11:54:03.000-07:00
diff --git a/src/client/datascience/interactive-ipynb/nativeEditor.ts b/src/client/datascience/interactive-ipynb/nativeEditor.ts
@@ -255,7 +255,7 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
                 this.synchronizer.notifyUserAction(payload, this);
                 break;
 
-            case InteractiveWindowMessages.ReExecuteCell:
+            case InteractiveWindowMessages.ReExecuteCells:
                 this.executedEvent.fire(this);
                 break;
 
diff --git a/src/client/datascience/interactive-ipynb/nativeEditorOldWebView.ts b/src/client/datascience/interactive-ipynb/nativeEditorOldWebView.ts
@@ -50,6 +50,7 @@ import {
 } from '../types';
 import { NativeEditor } from './nativeEditor';
 import { NativeEditorStorage } from './nativeEditorStorage';
+import { NativeEditorSynchronizer } from './nativeEditorSynchronizer';
 
 enum AskForSaveResult {
     Yes,
@@ -85,6 +86,7 @@ export class NativeEditorOldWebView extends NativeEditor {
         @inject(ICommandManager) commandManager: ICommandManager,
         @inject(INotebookExporter) jupyterExporter: INotebookExporter,
         @inject(IWorkspaceService) workspaceService: IWorkspaceService,
+        @inject(NativeEditorSynchronizer) synchronizer: NativeEditorSynchronizer,
         @inject(INotebookEditorProvider) editorProvider: INotebookEditorProvider,
         @inject(IDataViewerProvider) dataExplorerProvider: IDataViewerProvider,
         @inject(IJupyterVariables) jupyterVariables: IJupyterVariables,
@@ -114,6 +116,7 @@ export class NativeEditorOldWebView extends NativeEditor {
             commandManager,
             jupyterExporter,
             workspaceService,
+            synchronizer,
             editorProvider,
             dataExplorerProvider,
             jupyterVariables,
@@ -127,6 +130,7 @@ export class NativeEditorOldWebView extends NativeEditor {
             switcher
         );
         asyncRegistry.push(this);
+        synchronizer.disable();
     }
     public async load(model: INotebookModel, webViewPanel: WebviewPanel): Promise<void> {
         await super.load(model, webViewPanel);
@@ -263,7 +267,7 @@ export class NativeEditorOldWebView extends NativeEditor {
 
             const defaultUri =
                 Array.isArray(this.workspaceService.workspaceFolders) &&
-                this.workspaceService.workspaceFolders.length > 0
+                    this.workspaceService.workspaceFolders.length > 0
                     ? this.workspaceService.workspaceFolders[0].uri
                     : undefined;
             fileToSaveTo = await this.applicationShell.showSaveDialog({
diff --git a/src/client/datascience/interactive-ipynb/nativeEditorSynchronizer.ts b/src/client/datascience/interactive-ipynb/nativeEditorSynchronizer.ts
@@ -11,13 +11,20 @@ import { INotebookEditor } from '../types';
 
 // tslint:disable: no-any
 
-type UserActionNotificationCallback = <M extends IInteractiveWindowMapping, T extends keyof M>(type: T, payload?: M[T]) => void;
+type UserActionNotificationCallback = <M extends IInteractiveWindowMapping, T extends keyof M>(
+    type: T,
+    payload?: M[T]
+) => void;
 
 @injectable()
 export class NativeEditorSynchronizer {
     private registeredNotebooks = new Map<INotebookEditor, UserActionNotificationCallback>();
-    constructor(@inject(IFileSystem) private readonly fs: IFileSystem) {}
+    private enabled = false;
+    constructor(@inject(IFileSystem) private readonly fs: IFileSystem) { }
     public notifyUserAction(message: SyncPayload, editor: INotebookEditor) {
+        if (!this.enabled) {
+            return;
+        }
         this.registeredNotebooks.forEach((cb, item) => {
             if (item !== editor && this.fs.arePathsSame(item.file.fsPath, editor.file.fsPath)) {
                 cb(InteractiveWindowMessages.Sync, message as any);
@@ -27,4 +34,8 @@ export class NativeEditorSynchronizer {
     public subscribeToUserActions(editor: INotebookEditor, cb: UserActionNotificationCallback) {
         this.registeredNotebooks.set(editor, cb);
     }
+    public disable() {
+        this.enabled = false;
+        this.registeredNotebooks.clear();
+    }
 }
