From 9a5a48877ba0c02c06cc2688a7859ddb1c3d7690 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@yahoo.com>
Date: Fri, 19 Mar 2021 08:59:23 -0700
Subject: [PATCH] More fixes

---
 .../notebookStorage/nativeEditorStorage.ts        | 15 +++------------
 .../nativeEditorStorage.unit.test.ts              |  4 +---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/client/datascience/notebookStorage/nativeEditorStorage.ts b/src/client/datascience/notebookStorage/nativeEditorStorage.ts
index 8e90c1438742..9d0b4257d9ff 100644
--- a/src/client/datascience/notebookStorage/nativeEditorStorage.ts
+++ b/src/client/datascience/notebookStorage/nativeEditorStorage.ts
@@ -6,7 +6,6 @@ import * as path from 'path';
 import * as uuid from 'uuid/v4';
 import { CancellationToken, Memento, Uri } from 'vscode';
 import { createCodeCell } from '../../../datascience-ui/common/cellFactory';
-import { IPythonExtensionChecker } from '../../api/types';
 import { traceError } from '../../common/logger';
 import { isFileNotFoundError } from '../../common/platform/errors';
 import { IFileSystem } from '../../common/platform/types';
@@ -18,7 +17,6 @@ import { InvalidNotebookFileError } from '../jupyter/invalidNotebookFileError';
 import { INotebookModelFactory } from '../notebookStorage/types';
 import {
     CellState,
-    IJupyterExecution,
     IModelLoadOptions,
     INotebookModel,
     INotebookStorage,
@@ -57,15 +55,13 @@ export class NativeEditorStorage implements INotebookStorage {
     private backupRequested: { model: INotebookModel; cancellation: CancellationToken } | undefined;
 
     constructor(
-        @inject(IJupyterExecution) private jupyterExecution: IJupyterExecution,
         @inject(IFileSystem) private fs: IFileSystem,
         @inject(ICryptoUtils) private crypto: ICryptoUtils,
         @inject(IExtensionContext) private context: IExtensionContext,
         @inject(IMemento) @named(GLOBAL_MEMENTO) private globalStorage: Memento,
         @inject(IMemento) @named(WORKSPACE_MEMENTO) private localStorage: Memento,
         @inject(ITrustService) private trustService: ITrustService,
-        @inject(INotebookModelFactory) private readonly factory: INotebookModelFactory,
-        @inject(IPythonExtensionChecker) private readonly extensionChecker: IPythonExtensionChecker
+        @inject(INotebookModelFactory) private readonly factory: INotebookModelFactory
     ) {}
     private static isUntitledFile(file: Uri) {
         return isUntitledFile(file);
@@ -208,7 +204,7 @@ export class NativeEditorStorage implements INotebookStorage {
             traceError(`Error writing storage for ${filePath}: `, exc);
         }
     }
-    private async extractPythonMainVersion(notebookData: Partial<nbformat.INotebookContent>): Promise<number> {
+    private extractPythonMainVersion(notebookData: Partial<nbformat.INotebookContent>): number {
         if (
             notebookData &&
             notebookData.metadata &&
@@ -220,11 +216,6 @@ export class NativeEditorStorage implements INotebookStorage {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             return (notebookData.metadata.language_info.codemirror_mode as any).version;
         }
-        // Use the active interpreter if allowed
-        if (this.extensionChecker.isPythonExtensionActive) {
-            const usableInterpreter = await this.jupyterExecution.getUsableJupyterPython();
-            return usableInterpreter && usableInterpreter.version ? usableInterpreter.version.major : 3;
-        }
 
         return 3;
     }
@@ -368,7 +359,7 @@ export class NativeEditorStorage implements INotebookStorage {
                 remapped.splice(0, 0, this.createEmptyCell(uuid()));
             }
         }
-        const pythonNumber = json ? await this.extractPythonMainVersion(json) : 3;
+        const pythonNumber = json ? this.extractPythonMainVersion(json) : 3;
 
         const model = this.factory.createModel(
             {
diff --git a/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts b/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
index a482f2381c29..2a571c335d28 100644
--- a/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
+++ b/src/test/datascience/interactive-ipynb/nativeEditorStorage.unit.test.ts
@@ -352,15 +352,13 @@ suite('DataScience - Native Editor Storage', () => {
         const cellLanguageService = mock<NotebookCellLanguageService>();
         when(cellLanguageService.getPreferredLanguage(anything())).thenReturn(PYTHON_LANGUAGE);
         const notebookStorage = new NativeEditorStorage(
-            instance(executionProvider),
             fileSystem.object, // Use typemoq so can save values in returns
             instance(crypto),
             context.object,
             globalMemento,
             localMemento,
             instance(trustService),
-            new NotebookModelFactory(false, instance(mockVSC), instance(cellLanguageService)),
-            instance(extensionChecker)
+            new NotebookModelFactory(false, instance(mockVSC), instance(cellLanguageService))
         );
         const container = mock<IServiceContainer>();
         when(container.tryGet(anything())).thenReturn(undefined);