Temp

Author: Kartik Raj

src/client/common/terminal/factory.ts

@@ -28,7 +28,7 @@ export class TerminalServiceFactory implements ITerminalServiceFactory {
         const title = options?.title;
         const terminalTitle = typeof title === 'string' && title.trim().length > 0 ? title.trim() : 'Python';
         const interpreter = options?.interpreter;
-        const id = this.getTerminalId(terminalTitle, resource, interpreter);
+        const id = this.getTerminalId(terminalTitle, resource, interpreter, options);
         if (!this.terminalServices.has(id)) {
             const terminalService = new TerminalService(this.serviceContainer, options);
             this.terminalServices.set(id, terminalService);
@@ -46,13 +46,10 @@ export class TerminalServiceFactory implements ITerminalServiceFactory {
         title = typeof title === 'string' && title.trim().length > 0 ? title.trim() : 'Python';
         return new TerminalService(this.serviceContainer, { resource, title });
     }
-    private getTerminalId(title: string, resource?: Uri, interpreter?: PythonEnvironment): string {
-        if (!resource && !interpreter) {
-            return title;
-        }
+    private getTerminalId(title: string, resource?: Uri, interpreter?: PythonEnvironment, options?: TerminalCreationOptions): string {
         const workspaceFolder = this.serviceContainer
             .get<IWorkspaceService>(IWorkspaceService)
             .getWorkspaceFolder(resource || undefined);
-        return `${title}:${workspaceFolder?.uri.fsPath || ''}:${interpreter?.path}`;
+        return `${title}:${workspaceFolder?.uri.fsPath || ''}:${interpreter?.path}:${options?.message}`;
     }
 }

src/client/common/terminal/service.ts

@@ -42,6 +42,7 @@ export class TerminalService implements ITerminalService, Disposable {
         this.terminalAutoActivator = this.serviceContainer.get<ITerminalAutoActivation>(ITerminalAutoActivation);
         this.terminalManager.onDidCloseTerminal(this.terminalCloseHandler, this, disposableRegistry);
         this.terminalActivator = this.serviceContainer.get<ITerminalActivator>(ITerminalActivator);
+        this.ensureTerminal().ignoreErrors();
     }
     public dispose() {
         if (this.terminal) {
@@ -78,6 +79,7 @@ export class TerminalService implements ITerminalService, Disposable {
             name: this.options?.title || 'Python',
             env: this.options?.env,
             hideFromUser: this.options?.hideFromUser,
+            message: this.options?.message,
         });
         this.terminalAutoActivator.disableAutoActivation(this.terminal);
 

src/client/common/terminal/types.ts

@@ -84,6 +84,12 @@ export type TerminalCreationOptions = {
      * @type {boolean}
      */
     hideFromUser?: boolean;
+    /**
+     * A message to write to the terminal on first launch, note that this is not sent to the
+     * process but, rather written directly to the terminal. This supports escape sequences such
+     * a setting text style.
+     */
+    message?: string;
 };
 
 export interface ITerminalServiceFactory {

src/client/common/utils/localize.ts

@@ -277,6 +277,10 @@ export namespace Interpreters {
         'Interpreters.selectInterpreterTip',
         'Tip: you can change the Python interpreter used by the Python extension by clicking on the Python version in the status bar',
     );
+    export const installPythonTerminalMessage = localize(
+        'Interpreters.installPythonTerminalMessage',
+        'Please try installing python package using your package manager. Alternatively you can also download it from https://www.python.org/downloads',
+    );
 }
 
 export namespace InterpreterQuickPickList {

src/client/interpreter/configuration/interpreterSelector/commands/installPython/installPythonViaTerminal.ts

@@ -14,6 +14,13 @@ import { ICommandManager } from '../../../../../common/application/types';
 import { sleep } from '../../../../../common/utils/async';
 import { OSType } from '../../../../../common/utils/platform';
 import { traceVerbose } from '../../../../../logging';
+import { Interpreters } from '../../../../../common/utils/localize';
+
+enum PackageManagers {
+    brew = 'brew',
+    apt = 'apt',
+    dnf = 'dnf',
+}
 
 /**
  * Runs commands listed in walkthrough to install Python.
@@ -22,6 +29,12 @@ import { traceVerbose } from '../../../../../logging';
 export class InstallPythonViaTerminal implements IExtensionSingleActivationService {
     public readonly supportedWorkspaceTypes = { untrustedWorkspace: true, virtualWorkspace: false };
 
+    private readonly packageManagerCommands: Record<PackageManagers, string[]> = {
+        brew: ['brew install python3'],
+        dnf: ['sudo dnf install python3'],
+        apt: ['sudo apt-get update', 'sudo apt-get install python3 python3-venv python3-pip'],
+    };
+
     constructor(
         @inject(ICommandManager) private readonly commandManager: ICommandManager,
         @inject(ITerminalServiceFactory) private readonly terminalServiceFactory: ITerminalServiceFactory,
@@ -42,36 +55,42 @@ export class InstallPythonViaTerminal implements IExtensionSingleActivationServi
     }
 
     public async _installPythonOnUnix(os: OSType.Linux | OSType.OSX): Promise<void> {
-        const terminalService = this.terminalServiceFactory.getTerminalService({});
-        const commands = await getCommands(os);
+        const commands = await this.getCommands(os);
+        const terminalService = this.terminalServiceFactory.getTerminalService({
+            message: commands.length ? undefined : Interpreters.installPythonTerminalMessage,
+        });
         for (const command of commands) {
             await terminalService.sendText(command);
             await waitForCommandToProcess();
         }
     }
-}
 
-async function getCommands(os: OSType.Linux | OSType.OSX) {
-    if (os === OSType.OSX) {
-        return ['brew install python3'];
+    private async getCommands(os: OSType.Linux | OSType.OSX) {
+        if (os === OSType.OSX) {
+            return this.packageManagerCommands[PackageManagers.brew];
+        }
+        return this.getCommandsForLinux();
     }
-    return getCommandsForLinux();
-}
 
-async function getCommandsForLinux() {
-    let isDnfAvailable = false;
-    try {
-        const which = require('which') as typeof whichTypes;
-        const resolvedPath = await which('dnf');
-        traceVerbose('Resolved path to dnf module:', resolvedPath);
-        isDnfAvailable = resolvedPath.trim().length > 0;
-    } catch (ex) {
-        traceVerbose('Dnf not found', ex);
-        isDnfAvailable = false;
+    private async getCommandsForLinux() {
+        for (const packageManager of [PackageManagers.apt, PackageManagers.dnf]) {
+            let isPackageAvailable = false;
+            try {
+                const which = require('which') as typeof whichTypes;
+                const resolvedPath = await which(packageManager);
+                traceVerbose(`Resolved path to ${packageManager} module:`, resolvedPath);
+                isPackageAvailable = resolvedPath.trim().length > 0;
+            } catch (ex) {
+                traceVerbose(`${packageManager} not found`, ex);
+                isPackageAvailable = false;
+            }
+            isPackageAvailable = false;
+            if (isPackageAvailable) {
+                return this.packageManagerCommands[packageManager];
+            }
+        }
+        return [];
     }
-    return isDnfAvailable
-        ? ['sudo dnf install python3']
-        : ['sudo apt-get update', 'sudo apt-get install python3 python3-venv python3-pip'];
 }
 
 async function waitForCommandToProcess() {

src/client/pythonEnvironments/index.ts

@@ -134,23 +134,15 @@ function createNonWorkspaceLocators(ext: ExtensionState): ILocator<BasicEnvInfo>
     const locators: (ILocator<BasicEnvInfo> & Partial<IDisposable>)[] = [];
     locators.push(
         // OS-independent locators go here.
-        new PyenvLocator(),
-        new CondaEnvironmentLocator(),
-        new GlobalVirtualEnvironmentLocator(),
-        new CustomVirtualEnvironmentLocator(),
     );
 
     if (getOSType() === OSType.Windows) {
         locators.push(
             // Windows specific locators go here.
-            new WindowsRegistryLocator(),
-            new WindowsStoreLocator(),
-            new WindowsPathEnvVarLocator(),
         );
     } else {
         locators.push(
             // Linux/Mac locators go here.
-            new PosixKnownPathsLocator(),
         );
     }
 
@@ -179,7 +171,7 @@ function watchRoots(args: WatchRootsArgs): IDisposable {
 
 function createWorkspaceLocator(ext: ExtensionState): WorkspaceLocators<BasicEnvInfo> {
     const locators = new WorkspaceLocators<BasicEnvInfo>(watchRoots, [
-        (root: vscode.Uri) => [new WorkspaceVirtualEnvironmentLocator(root.fsPath), new PoetryLocator(root.fsPath)],
+        (root: vscode.Uri) => [],
         // Add an ILocator factory func here for each kind of workspace-rooted locator.
     ]);
     ext.disposables.push(locators);