fixes

Author: DonJayamanne

.vscode/launch.json

@@ -58,7 +58,10 @@
 ],
 "stopOnEntry": false,
 "sourceMaps": true,
-"outDir": "${workspaceRoot}/out/test",
+"xxoutDir": "${workspaceRoot}/out/test",
+"outFiles": [
+"${workspaceRoot}/out/**/*.js"
+],
 "preLaunchTask": "npm"
 },
 {

src/client/common/enumUtils.ts

@@ -0,0 +1,17 @@
+export class EnumEx {
+ static getNamesAndValues<T extends number>(e: any) {
+ return EnumEx.getNames(e).map(n => ({ name: n, value: e[n] as T }));
+ }
+
+ static getNames(e: any) {
+ return EnumEx.getObjValues(e).filter(v => typeof v === "string") as string[];
+ }
+
+ static getValues<T extends number>(e: any) {
+ return EnumEx.getObjValues(e).filter(v => typeof v === "number") as T[];
+ }
+
+ private static getObjValues(e: any): (number | string)[] {
+ return Object.keys(e).map(k => e[k]);
+ }
+}

src/client/common/helpers.ts

@@ -1,7 +1,13 @@
 const tmp = require('tmp');
 
 export function isNotInstalledError(error: Error): boolean {
- return typeof (error) === 'object' && error !== null && ((<any>error).code === 'ENOENT' || (<any>error).code === 127);
+ const isError = typeof (error) === 'object' && error !== null;
+ const errorObj = <any>error;
+ if (!isError) {
+ return false;
+ }
+ const isModuleNoInstalledError = errorObj.code === 1 && error.message.indexOf('No module named') >= 0;
+ return errorObj.code === 'ENOENT' || errorObj.code === 127 || isModuleNoInstalledError;
 }
 
 export interface Deferred<T> {
@@ -29,7 +35,7 @@ class DeferredImpl<T> implements Deferred<T> {
  this._resolve.apply(this.scope ? this.scope : this, arguments);
  this._resolved = true;
  }
- reject(reason?: any){
+ reject(reason?: any) {
  this._reject.apply(this.scope ? this.scope : this, arguments);
  this._rejected = true;
  }

src/client/common/installer.ts

@@ -34,13 +34,31 @@ ProductInstallScripts.set(Product.pylint, ['-m', 'pip', 'install', 'pylint']);
 ProductInstallScripts.set(Product.pytest, ['-m', 'pip', 'install', '-U', 'pytest']);
 ProductInstallScripts.set(Product.yapf, ['-m', 'pip', 'install', 'yapf']);
 
-export const ProductExecutableAndArgs = new Map<Product, {executable: string, args: string[]}>();
-ProductExecutableAndArgs.set(Product.mypy, {executable: 'python', args:['-m', 'mypy']});
-ProductExecutableAndArgs.set(Product.nosetest, {executable: 'python', args:['-m', 'nose']});
-ProductExecutableAndArgs.set(Product.pylama, {executable: 'python', args:['-m', 'pylama']});
-ProductExecutableAndArgs.set(Product.prospector, {executable: 'python', args:['-m', 'prospector']});
-ProductExecutableAndArgs.set(Product.pylint, {executable: 'python', args:['-m', 'pylint']});
-ProductExecutableAndArgs.set(Product.pytest, {executable: 'python', args:['-m', 'pytest']});
+const ProductUninstallScripts = new Map<Product, string[]>();
+ProductUninstallScripts.set(Product.autopep8, ['-m', 'pip', 'uninstall', 'autopep8', '--yes']);
+ProductUninstallScripts.set(Product.flake8, ['-m', 'pip', 'uninstall', 'flake8', '--yes']);
+ProductUninstallScripts.set(Product.mypy, ['-m', 'pip', 'uninstall', 'mypy', '--yes']);
+ProductUninstallScripts.set(Product.nosetest, ['-m', 'pip', 'uninstall', 'nose', '--yes']);
+ProductUninstallScripts.set(Product.pep8, ['-m', 'pip', 'uninstall', 'pep8', '--yes']);
+ProductUninstallScripts.set(Product.pylama, ['-m', 'pip', 'uninstall', 'pylama', '--yes']);
+ProductUninstallScripts.set(Product.prospector, ['-m', 'pip', 'uninstall', 'prospector', '--yes']);
+ProductUninstallScripts.set(Product.pydocstyle, ['-m', 'pip', 'uninstall', 'pydocstyle', '--yes']);
+ProductUninstallScripts.set(Product.pylint, ['-m', 'pip', 'uninstall', 'pylint', '--yes']);
+ProductUninstallScripts.set(Product.pytest, ['-m', 'pip', 'uninstall', 'pytest', '--yes']);
+ProductUninstallScripts.set(Product.yapf, ['-m', 'pip', 'uninstall', 'yapf', '--yes']);
+
+export const ProductExecutableAndArgs = new Map<Product, { executable: string, args: string[] }>();
+ProductExecutableAndArgs.set(Product.mypy, { executable: 'python', args: ['-m', 'mypy'] });
+ProductExecutableAndArgs.set(Product.nosetest, { executable: 'python', args: ['-m', 'nose'] });
+ProductExecutableAndArgs.set(Product.pylama, { executable: 'python', args: ['-m', 'pylama'] });
+ProductExecutableAndArgs.set(Product.prospector, { executable: 'python', args: ['-m', 'prospector'] });
+ProductExecutableAndArgs.set(Product.pylint, { executable: 'python', args: ['-m', 'pylint'] });
+ProductExecutableAndArgs.set(Product.pytest, { executable: 'python', args: ['-m', 'pytest'] });
+ProductExecutableAndArgs.set(Product.autopep8, { executable: 'python', args: ['-m', 'autopep8'] });
+ProductExecutableAndArgs.set(Product.pep8, { executable: 'python', args: ['-m', 'pep8'] });
+ProductExecutableAndArgs.set(Product.pydocstyle, { executable: 'python', args: ['-m', 'pydocstyle'] });
+ProductExecutableAndArgs.set(Product.yapf, { executable: 'python', args: ['-m', 'yapf'] });
+ProductExecutableAndArgs.set(Product.flake8, { executable: 'python', args: ['-m', 'flake8'] });
 
 switch (os.platform()) {
  case 'win32': {
@@ -72,8 +90,7 @@ ProductNames.set(Product.pylint, 'pylint');
 ProductNames.set(Product.pytest, 'py.test');
 ProductNames.set(Product.yapf, 'yapf');
 
-const SettingToDisableProduct = new Map<Product, string>();
-SettingToDisableProduct.set(Product.autopep8, 'autopep8');
+export const SettingToDisableProduct = new Map<Product, string>();
 SettingToDisableProduct.set(Product.flake8, 'linting.flake8Enabled');
 SettingToDisableProduct.set(Product.mypy, 'linting.mypyEnabled');
 SettingToDisableProduct.set(Product.nosetest, 'unitTest.nosetestsEnabled');
@@ -83,7 +100,6 @@ SettingToDisableProduct.set(Product.prospector, 'linting.prospectorEnabled');
 SettingToDisableProduct.set(Product.pydocstyle, 'linting.pydocstyleEnabled');
 SettingToDisableProduct.set(Product.pylint, 'linting.pylintEnabled');
 SettingToDisableProduct.set(Product.pytest, 'unitTest.pyTestEnabled');
-SettingToDisableProduct.set(Product.yapf, 'yapf');
 
 export class Installer {
  private static terminal: vscode.Terminal;
@@ -117,7 +133,7 @@ export class Installer {
  return vscode.window.showErrorMessage(`${productType} ${productName} is not installed`, ...options).then(item => {
  switch (item) {
  case installOption: {
- return this.installProduct(product);
+ return this.install(product);
  }
  case disableOption: {
  if (Linters.indexOf(product) >= 0) {
@@ -140,7 +156,7 @@ export class Installer {
  });
  }
 
- installProduct(product: Product): Promise<any> {
+ install(product: Product): Promise<any> {
  if (!this.outputChannel && !Installer.terminal) {
  Installer.terminal = vscode.window.createTerminal('Python Installer');
  }
@@ -190,9 +206,13 @@ export class Installer {
  }
  }
 
- isProductInstalled(product: Product): Promise<boolean> {
+ isInstalled(product: Product): Promise<boolean> {
  return isProductInstalled(product);
  }
+
+ uninstall(product: Product): Promise<any> {
+ return uninstallproduct(product);
+ }
 }
 
 export function disableLinter(product: Product) {
@@ -206,30 +226,17 @@ export function disableLinter(product: Product) {
  }
 }
 
-function isTestFrameworkInstalled(product: Product): Promise<boolean> {
- const fileToRun = product === Product.pytest ? 'py.test' : 'nosetests';
- const def = createDeferred<boolean>();
- execPythonFile(fileToRun, ['--version'], vscode.workspace.rootPath, false)
+function isProductInstalled(product: Product): Promise<boolean> {
+ const prodExec = ProductExecutableAndArgs.get(product);
+ return execPythonFile(prodExec.executable, prodExec.args.concat(['--version']), vscode.workspace.rootPath, false, undefined, undefined, true)
  .then(() => {
- def.resolve(true);
+ return true;
  }).catch(reason => {
- if (isNotInstalledError(reason)) {
- def.resolve(false);
- }
- else {
- def.resolve(true);
- }
+ return !isNotInstalledError(reason);
  });
- return def.promise;
 }
-function isProductInstalled(product: Product): Promise<boolean> {
- switch (product) {
- case Product.pytest: {
- return isTestFrameworkInstalled(product);
- }
- case Product.nosetest: {
- return isTestFrameworkInstalled(product);
- }
- }
- throw new Error('Not supported');
+
+function uninstallproduct(product: Product): Promise<any> {
+ const uninstallArgs = ProductUninstallScripts.get(product);
+ return execPythonFile('python', uninstallArgs, vscode.workspace.rootPath, false, undefined, undefined, true);
 }

src/client/common/utils.ts

@@ -96,13 +96,17 @@ export function getPathFromPythonCommand(args: string[]): Promise<string> {
  });
 }
 
-export function execPythonFile(file: string, args: string[], cwd: string, includeErrorAsResponse: boolean = false, stdOut: (line: string) => void = null, token?: CancellationToken): Promise<string> {
+export function execPythonFile(file: string, args: string[], cwd: string, includeErrorAsResponse: boolean = false, stdOut: (line: string) => void = null, token?: CancellationToken, execAsModule: boolean = false): Promise<string> {
  // If running the python file, then always revert to execFileInternal
  // Cuz python interpreter is always a file and we can and will always run it using child_process.execFile()
  if (file === settings.PythonSettings.getInstance().pythonPath) {
  if (stdOut) {
  return spawnFileInternal(file, args, { cwd }, includeErrorAsResponse, stdOut, token);
  }
+ if (execAsModule) {
+ return getFullyQualifiedPythonInterpreterPath()
+ .then(p => execPythonModule(p, args, { cwd: cwd }, includeErrorAsResponse, token));
+ }
  return execFileInternal(file, args, { cwd: cwd }, includeErrorAsResponse, token);
  }
 
@@ -136,47 +140,84 @@ export function execPythonFile(file: string, args: string[], cwd: string, includ
  if (stdOut) {
  return spawnFileInternal(file, args, { cwd, env: customEnvVariables }, includeErrorAsResponse, stdOut, token);
  }
+ if (execAsModule) {
+ return getFullyQualifiedPythonInterpreterPath()
+ .then(p => execPythonModule(p, args, { cwd: cwd }, includeErrorAsResponse, token));
+ }
  return execFileInternal(file, args, { cwd, env: customEnvVariables }, includeErrorAsResponse, token);
  });
 }
 
 function handleResponse(file: string, includeErrorAsResponse: boolean, error: Error, stdout: string, stderr: string, token?: CancellationToken): Promise<string> {
- return new Promise<string>((resolve, reject) => {
- if (token && token.isCancellationRequested) {
- return;
- }
- if (isNotInstalledError(error)) {
- return reject(error);
- }
+ if (token && token.isCancellationRequested) {
+ return Promise.resolve(undefined);
+ }
+ if (isNotInstalledError(error)) {
+ return Promise.reject(error);
+ }
 
-  // pylint:
-  // In the case of pylint we have some messages (such as config file not found and using default etc...) being returned in stderr
-  // These error messages are useless when using pylint 
-  if (includeErrorAsResponse && (stdout.length > 0 || stderr.length > 0)) {
-  return resolve(stdout + '\n' + stderr);
-  }
+ // pylint:
+ // In the case of pylint we have some messages (such as config file not found and using default etc...) being returned in stderr
+ // These error messages are useless when using pylint 
+ if (includeErrorAsResponse && (stdout.length > 0 || stderr.length > 0)) {
+ return Promise.resolve(stdout + '\n' + stderr);
+ }
 
- let hasErrors = (error && error.message.length > 0) || (stderr && stderr.length > 0);
- if (hasErrors && (typeof stdout !== 'string' || stdout.length === 0)) {
- let errorMsg = (error && error.message) ? error.message : (stderr && stderr.length > 0 ? stderr + '' : '');
- console.error('stdout');
- console.error(stdout);
- console.error('stderr');
- console.error(stderr);
- console.error('error');
- console.error(error);
- console.error('Over');
- return reject(errorMsg);
- }
+ let hasErrors = (error && error.message.length > 0) || (stderr && stderr.length > 0);
+ if (hasErrors && (typeof stdout !== 'string' || stdout.length === 0)) {
+ let errorMsg = (error && error.message) ? error.message : (stderr && stderr.length > 0 ? stderr + '' : '');
+ return Promise.reject(errorMsg);
+ }
+ else {
+ return Promise.resolve(stdout + '');
+ }
+}
+function handlePythonModuleResponse(includeErrorAsResponse: boolean, error: Error, stdout: string, stderr: string, token?: CancellationToken): Promise<string> {
+ if (token && token.isCancellationRequested) {
+ return Promise.resolve(undefined);
+ }
+ if (isNotInstalledError(error) || !!error) {
+ return Promise.reject(error);
+ }
 
- resolve(stdout + '');
+ // pylint:
+ // In the case of pylint we have some messages (such as config file not found and using default etc...) being returned in stderr
+ // These error messages are useless when using pylint 
+ if (includeErrorAsResponse && (stdout.length > 0 || stderr.length > 0)) {
+ return Promise.resolve(stdout + '\n' + stderr);
+ }
+ if (!includeErrorAsResponse && stderr.length > 0) {
+ return Promise.reject(stderr);
+ }
+
+ return Promise.resolve(stdout + '');
+}
+function execPythonModule(file: string, args: string[], options: child_process.ExecFileOptions, includeErrorAsResponse: boolean, token?: CancellationToken): Promise<string> {
+ options.maxBuffer = options.maxBuffer ? options.maxBuffer : 1024 * 102400;
+ return new Promise<string>((resolve, reject) => {
+ let proc = child_process.execFile(file, args, options, (error, stdout, stderr) => {
+ handlePythonModuleResponse(includeErrorAsResponse, error, stdout, stderr, token)
+ .then(resolve)
+ .catch(reject);
+ });
+ if (token && token.onCancellationRequested) {
+ token.onCancellationRequested(() => {
+ if (proc) {
+ proc.kill();
+ proc = null;
+ }
+ });
+ }
  });
 }
+
 function execFileInternal(file: string, args: string[], options: child_process.ExecFileOptions, includeErrorAsResponse: boolean, token?: CancellationToken): Promise<string> {
  options.maxBuffer = options.maxBuffer ? options.maxBuffer : 1024 * 102400;
  return new Promise<string>((resolve, reject) => {
  let proc = child_process.execFile(file, args, options, (error, stdout, stderr) => {
- handleResponse(file, includeErrorAsResponse, error, stdout, stderr, token).then(resolve, reject);
+ handleResponse(file, includeErrorAsResponse, error, stdout, stderr, token)
+ .then(data => resolve(data))
+ .catch(err => reject(err));
  });
  if (token && token.onCancellationRequested) {
  token.onCancellationRequested(() => {
@@ -202,7 +243,7 @@ function spawnFileInternal(file: string, args: string[], options: child_process.
  });
  }
  proc.on('error', error => {
- return reject(error);
+ reject(error);
  });
  proc.stdout.setEncoding('utf8');
  proc.stderr.setEncoding('utf8');
@@ -243,7 +284,9 @@ function spawnFileInternal(file: string, args: string[], options: child_process.
 function execInternal(command: string, args: string[], options: child_process.ExecFileOptions, includeErrorAsResponse: boolean): Promise<string> {
  return new Promise<string>((resolve, reject) => {
  child_process.exec([command].concat(args).join(' '), options, (error, stdout, stderr) => {
- handleResponse(command, includeErrorAsResponse, error, stdout, stderr).then(resolve, reject);
+ handleResponse(command, includeErrorAsResponse, error, stdout, stderr)
+ .then(data => resolve(data))
+ .catch(err => reject(err));
  });
  });
 }
@@ -308,9 +351,7 @@ export function getCustomEnvVars(): any {
  }
  }
  catch (ex) {
- console.error('Failed to load env file');
- console.error(ex);
- return null;
+ console.error('Failed to load env file', ex);
  }
  }
  return null;