Author: Nikola Hristov

Source/channelManager.ts

@@ -30,28 +30,34 @@ export class InstallationChannelManager implements IInstallationChannelManager {
 		resource?: InterpreterUri,
 	): Promise<IModuleInstaller | undefined> {
 		const channels = await this.getInstallationChannels(resource);
+
 		if (channels.length === 1) {
 			return channels[0];
 		}
 
 		const productName = ProductNames.get(product)!;
+
 		const appShell =
 			this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+
 		if (channels.length === 0) {
 			await this.showNoInstallersMessage(
 				isResource(resource) ? resource : undefined,
 			);
+
 			return;
 		}
 
 		const placeHolder = `Select an option to install ${productName}`;
+
 		const options = channels.map((installer) => {
 			return {
 				label: `Install using ${installer.displayName}`,
 				description: "",
 				installer,
 			};
 		});
+
 		const selection = await appShell.showQuickPick<(typeof options)[0]>(
 			options,
 			{
@@ -60,6 +66,7 @@ export class InstallationChannelManager implements IInstallationChannelManager {
 				placeHolder,
 			},
 		);
+
 		return selection ? selection.installer : undefined;
 	}
 
@@ -68,13 +75,17 @@ export class InstallationChannelManager implements IInstallationChannelManager {
 	): Promise<IModuleInstaller[]> {
 		const installers =
 			this.serviceContainer.getAll<IModuleInstaller>(IModuleInstaller);
+
 		const supportedInstallers: IModuleInstaller[] = [];
+
 		if (installers.length === 0) {
 			return [];
 		}
 		// group by priority and pick supported from the highest priority
 		installers.sort((a, b) => b.priority - a.priority);
+
 		let currentPri = installers[0].priority;
+
 		for (const mi of installers) {
 			if (mi.priority !== currentPri) {
 				if (supportedInstallers.length > 0) {
@@ -93,15 +104,20 @@ export class InstallationChannelManager implements IInstallationChannelManager {
 	public async showNoInstallersMessage(resource?: Uri): Promise<void> {
 		const interpreters =
 			this.serviceContainer.get<IInterpreterService>(IInterpreterService);
+
 		const interpreter = await interpreters.getActiveInterpreter(resource);
+
 		if (!interpreter) {
 			return; // Handled in the Python installation check.
 		}
 
 		const appShell =
 			this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+
 		const search = "Search for help";
+
 		let result: string | undefined;
+
 		if (interpreter.envType === EnvironmentType.Conda) {
 			result = await appShell.showErrorMessage(
 				Installer.noCondaOrPipInstaller(),
@@ -116,6 +132,7 @@ export class InstallationChannelManager implements IInstallationChannelManager {
 		if (result === search) {
 			const platform =
 				this.serviceContainer.get<IPlatformService>(IPlatformService);
+
 			const osName = platform.isWindows
 				? "Windows"
 				: platform.isMac

Source/condaInstaller.ts

@@ -59,6 +59,7 @@ export class CondaInstaller extends ModuleInstaller {
 		const condaLocator =
 			this.serviceContainer.get<ICondaService>(ICondaService);
 		this._isCondaAvailable = await condaLocator.isCondaAvailable();
+
 		if (!this._isCondaAvailable) {
 			return false;
 		}
@@ -76,16 +77,20 @@ export class CondaInstaller extends ModuleInstaller {
 	): Promise<ExecutionInfo> {
 		const condaService =
 			this.serviceContainer.get<ICondaService>(ICondaService);
+
 		const condaFile = await condaService.getCondaFile();
 
 		const pythonPath = isResource(resource)
 			? this.serviceContainer
 					.get<IConfigurationService>(IConfigurationService)
 					.getSettings(resource).pythonPath
 			: resource.path;
+
 		const condaLocatorService =
 			this.serviceContainer.get<IComponentAdapter>(IComponentAdapter);
+
 		const info = await condaLocatorService.getCondaEnvironment(pythonPath);
+
 		const args = [
 			flags & ModuleInstallFlags.upgrade ? "update" : "install",
 		];
@@ -124,6 +129,7 @@ export class CondaInstaller extends ModuleInstaller {
 		}
 		args.push(moduleName);
 		args.push("-y");
+
 		return {
 			args,
 			execPath: condaFile,
@@ -138,11 +144,13 @@ export class CondaInstaller extends ModuleInstaller {
 	): Promise<boolean> {
 		const condaService =
 			this.serviceContainer.get<IComponentAdapter>(IComponentAdapter);
+
 		const pythonPath = isResource(resource)
 			? this.serviceContainer
 					.get<IConfigurationService>(IConfigurationService)
 					.getSettings(resource).pythonPath
 			: resource.path;
+
 		return condaService.isCondaEnvironment(pythonPath);
 	}
 }

Source/extensionBuildInstaller.ts

@@ -34,6 +34,7 @@ export class StableBuildInstaller implements IExtensionBuildInstaller {
 				progress.report({
 					message: ExtensionChannels.installingStableMessage(),
 				});
+
 				return this.cmdManager.executeCommand(
 					"workbench.extensions.installExtension",
 					PVSC_EXTENSION_ID,
@@ -67,6 +68,7 @@ export class InsidersBuildInstaller implements IExtensionBuildInstaller {
 				progress.report({
 					message: ExtensionChannels.installingInsidersMessage(),
 				});
+
 				return this.cmdManager.executeCommand(
 					"workbench.extensions.installExtension",
 					Uri.file(vsixFilePath),
@@ -83,15 +85,18 @@ export class InsidersBuildInstaller implements IExtensionBuildInstaller {
 	@traceDecoratorError("Downloading insiders build of extension failed")
 	public async downloadInsiders(): Promise<string> {
 		traceLog(ExtensionChannels.startingDownloadOutputMessage());
+
 		const downloadOptions = {
 			extension: vsixFileExtension,
 			progressMessagePrefix:
 				ExtensionChannels.downloadingInsidersMessage(),
 		};
+
 		return this.fileDownloader
 			.downloadFile(developmentBuildUri, downloadOptions)
 			.then((file) => {
 				traceLog(ExtensionChannels.downloadCompletedOutputMessage());
+
 				return file;
 			});
 	}

Source/moduleInstaller.ts

@@ -53,6 +53,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 			typeof productOrModuleName == "string"
 				? productOrModuleName
 				: translateProductToModule(productOrModuleName);
+
 		const productName =
 			typeof productOrModuleName === "string"
 				? name
@@ -61,8 +62,11 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 			installer: this.displayName,
 			productName,
 		});
+
 		const uri = isResource(resource) ? resource : undefined;
+
 		const options: TerminalCreationOptions = {};
+
 		if (isResource(resource)) {
 			options.resource = uri;
 		} else {
@@ -73,35 +77,43 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 			resource,
 			flags,
 		);
+
 		const terminalService = this.serviceContainer
 			.get<ITerminalServiceFactory>(ITerminalServiceFactory)
 			.getTerminalService(options);
+
 		const install = async (token?: CancellationToken) => {
 			const executionInfoArgs = await this.processInstallArgs(
 				executionInfo.args,
 				resource,
 			);
+
 			if (executionInfo.moduleName) {
 				const configService =
 					this.serviceContainer.get<IConfigurationService>(
 						IConfigurationService,
 					);
+
 				const settings = configService.getSettings(uri);
 
 				const interpreterService =
 					this.serviceContainer.get<IInterpreterService>(
 						IInterpreterService,
 					);
+
 				const interpreter = isResource(resource)
 					? await interpreterService.getActiveInterpreter(resource)
 					: resource;
+
 				const pythonPath = isResource(resource)
 					? settings.pythonPath
 					: resource.path;
+
 				const args = internalPython.execModule(
 					executionInfo.moduleName,
 					executionInfoArgs,
 				);
+
 				if (
 					!interpreter ||
 					interpreter.envType !== EnvironmentType.Unknown
@@ -110,6 +122,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 				} else if (settings.globalModuleInstallation) {
 					const fs =
 						this.serviceContainer.get<IFileSystem>(IFileSystem);
+
 					if (
 						await fs
 							.isDirReadonly(path.dirname(pythonPath))
@@ -148,6 +161,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 		if (cancel) {
 			const shell =
 				this.serviceContainer.get<IApplicationShell>(IApplicationShell);
+
 			const options: ProgressOptions = {
 				location: ProgressLocation.Notification,
 				cancellable: true,
@@ -168,10 +182,12 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 		const options = {
 			name: "VS Code Python",
 		};
+
 		const outputChannel = this.serviceContainer.get<IOutputChannel>(
 			IOutputChannel,
 			STANDARD_OUTPUT_CHANNEL,
 		);
+
 		const command = `"${execPath.replace(/\\/g, "/")}" ${args.join(" ")}`;
 
 		traceLog(`[Elevated] ${command}`);
@@ -190,6 +206,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 					await shell.showErrorMessage(error);
 				} else {
 					outputChannel.show();
+
 					if (stdout) {
 						traceLog(stdout);
 					}
@@ -212,11 +229,13 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 		const indexOfPylint = args.findIndex(
 			(arg) => arg.toUpperCase() === "PYLINT",
 		);
+
 		if (indexOfPylint === -1) {
 			return args;
 		}
 		const interpreterService =
 			this.serviceContainer.get<IInterpreterService>(IInterpreterService);
+
 		const interpreter = isResource(resource)
 			? await interpreterService.getActiveInterpreter(resource)
 			: resource;
@@ -229,6 +248,7 @@ export abstract class ModuleInstaller implements IModuleInstaller {
 			const newArgs = [...args];
 			// This command could be sent to the terminal, hence '<' needs to be escaped for UNIX.
 			newArgs[indexOfPylint] = '"pylint<2.0.0"';
+
 			return newArgs;
 		}
 		return args;
@@ -239,52 +259,76 @@ export function translateProductToModule(product: Product): string {
 	switch (product) {
 		case Product.mypy:
 			return "mypy";
+
 		case Product.pylama:
 			return "pylama";
+
 		case Product.prospector:
 			return "prospector";
+
 		case Product.pylint:
 			return "pylint";
+
 		case Product.pytest:
 			return "pytest";
+
 		case Product.autopep8:
 			return "autopep8";
+
 		case Product.black:
 			return "black";
+
 		case Product.pycodestyle:
 			return "pycodestyle";
+
 		case Product.pydocstyle:
 			return "pydocstyle";
+
 		case Product.yapf:
 			return "yapf";
+
 		case Product.flake8:
 			return "flake8";
+
 		case Product.unittest:
 			return "unittest";
+
 		case Product.bandit:
 			return "bandit";
+
 		case Product.jupyter:
 			return "jupyter";
+
 		case Product.notebook:
 			return "notebook";
+
 		case Product.pandas:
 			return "pandas";
+
 		case Product.ipykernel:
 			return "ipykernel";
+
 		case Product.nbconvert:
 			return "nbconvert";
+
 		case Product.kernelspec:
 			return "kernelspec";
+
 		case Product.tensorboard:
 			return "tensorboard";
+
 		case Product.torchProfilerInstallName:
 			return "torch-tb-profiler";
+
 		case Product.torchProfilerImportName:
 			return "torch_tb_profiler";
+
 		case Product.pip:
 			return "pip";
+
 		case Product.ensurepip:
 			return "ensurepip";
+
 		default: {
 			throw new Error(
 				`Product ${product} cannot be installed as a Python Module.`,

Source/pipEnvInstaller.ts

@@ -45,11 +45,13 @@ export class PipEnvInstaller extends ModuleInstaller {
 			const interpreter = await this.serviceContainer
 				.get<IInterpreterService>(IInterpreterService)
 				.getActiveInterpreter(resource);
+
 			const workspaceFolder = resource
 				? this.serviceContainer
 						.get<IWorkspaceService>(IWorkspaceService)
 						.getWorkspaceFolder(resource)
 				: undefined;
+
 			if (
 				!interpreter ||
 				!workspaceFolder ||
@@ -76,7 +78,9 @@ export class PipEnvInstaller extends ModuleInstaller {
 			flags & ModuleInstallFlags.reInstall ||
 			flags & ModuleInstallFlags.updateDependencies ||
 			flags & ModuleInstallFlags.upgrade;
+
 		const args = [update ? "update" : "install", moduleName, "--dev"];
+
 		if (moduleName === "black") {
 			args.push("--pre");
 		}