Fixes #56 list all environments (DonJayamanne#219)

* Fix microsoft/vscode#37627 (DonJayamanne#1368)

Author: DonJayamanne

src/client/common/utils.ts

@@ -413,16 +413,15 @@ export function getWindowsLineEndingCount(document: TextDocument, offset: Number
 }
 
 export function arePathsSame(path1: string, path2: string) {
- path1 = IS_WINDOWS ? path1.replace(/\//g, "\\") : path1;
- path2 = IS_WINDOWS ? path2.replace(/\//g, "\\") : path2;
- return path1.toUpperCase() === path2.toUpperCase();
+ path1 = path.normalize(path1);
+ path2 = path.normalize(path2);
+ if (IS_WINDOWS) {
+ return path1.toUpperCase() === path2.toUpperCase();
+ } else {
+ return path1 === path2;
+ }
 }
 
-export function areBasePathsSame(path1: string, path2: string) {
- path1 = IS_WINDOWS ? path1.replace(/\//g, "\\") : path1;
- path2 = IS_WINDOWS ? path2.replace(/\//g, "\\") : path2;
- return path.dirname(path1).toUpperCase() === path.dirname(path2).toUpperCase();
-}
 export async function getInterpreterVersion(pythonPath: string) {
  return await new Promise<string>((resolve, reject) => {
  child_process.execFile(pythonPath, ['--version'], (error, stdout, stdErr) => {

src/client/interpreter/locators/index.ts

@@ -2,9 +2,9 @@
 import * as _ from 'lodash';
 import { Disposable, Uri, workspace } from 'vscode';
 import { RegistryImplementation } from '../../common/registry';
-import { areBasePathsSame, arePathsSame, Is_64Bit, IS_WINDOWS } from '../../common/utils';
+import { arePathsSame, Is_64Bit, IS_WINDOWS } from '../../common/utils';
 import { IInterpreterLocatorService, PythonInterpreter } from '../contracts';
-import { IInterpreterVersionService, InterpreterVersionService } from '../interpreterVersion';
+import { InterpreterVersionService } from '../interpreterVersion';
 import { VirtualEnvironmentManager } from '../virtualEnvs';
 import { fixInterpreterDisplayName, fixInterpreterPath } from './helpers';
 import { CondaEnvFileService, getEnvironmentsFile as getCondaEnvFile } from './services/condaEnvFileService';
@@ -46,16 +46,15 @@ export class PythonInterpreterLocatorService implements IInterpreterLocatorServi
  }
  private async getInterpretersPerResource(resource?: Uri) {
  const locators = this.getLocators(resource);
- const promises = locators.map(provider => provider.getInterpreters(resource));
+ const promises = locators.map(async provider => provider.getInterpreters(resource));
  const listOfInterpreters = await Promise.all(promises);
 
  // tslint:disable-next-line:underscore-consistent-invocation
  return _.flatten(listOfInterpreters)
  .map(fixInterpreterDisplayName)
  .map(fixInterpreterPath)
  .reduce<PythonInterpreter[]>((accumulator, current) => {
- if (accumulator.findIndex(item => arePathsSame(item.path, current.path)) === -1 &&
- accumulator.findIndex(item => areBasePathsSame(item.path, current.path)) === -1) {
+ if (accumulator.findIndex(item => arePathsSame(item.path, current.path)) === -1) {
  accumulator.push(current);
  }
  return accumulator;

tslint.json

@@ -42,6 +42,7 @@
  "Thenable",
  "PromiseLike"
  ],
- "completed-docs": false
+ "completed-docs": false,
+ "no-unsafe-any": false
  }
 }