Skip to content

Temporarily switch to node FS apis in KnownPathsService #11340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karthik Nadig (karthiknadig) merged 3 commits into from
Apr 23, 2020
Merged

Temporarily switch to node FS apis in KnownPathsService #11340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f90e78
Update package lock
karthiknadig Apr 22, 2020
888cc14
Use node FS API while looking for paths.
karthiknadig Apr 22, 2020
de77598
Use fs-extras instead
karthiknadig Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use node FS API while looking for paths.
  • Loading branch information
@karthiknadig
karthiknadig committed Apr 22, 2020
commit 888cc141db422026d8505dde76d9b79abe18837a
1 change: 1 addition & 0 deletions news/2 Fixes/10850.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use node FS APIs when searching for python. This is a temporary change until VSC FS APIs are fixed.
13 changes: 9 additions & 4 deletions src/client/interpreter/locators/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import * as fsapi from 'fs';
import { inject, injectable } from 'inversify';
import * as path from 'path';
import { promisify } from 'util';
import { traceError } from '../../common/logger';
import { IS_WINDOWS } from '../../common/platform/constants';
import { IFileSystem } from '../../common/platform/types';
Expand All @@ -8,13 +10,16 @@ import { IPipEnvServiceHelper } from './types';

const CheckPythonInterpreterRegEx = IS_WINDOWS ? /^python(\d+(.\d+)?)?\.exe$/ : /^python(\d+(.\d+)?)?$/;

export async function lookForInterpretersInDirectory(pathToCheck: string, fs: IFileSystem): Promise<string[]> {
export async function lookForInterpretersInDirectory(pathToCheck: string, _: IFileSystem): Promise<string[]> {
// Technically, we should be able to use fs.getFiles(). However,
// that breaks some tests. So we stick with the broader behavior.
try {
const subDirs = await fs.listdir(pathToCheck);
return subDirs
.map(([filename, _ft]) => filename)
// tslint:disable-next-line: no-suspicious-comment
// TODO https://github.com/microsoft/vscode-python/issues/11338
const readdir = promisify(fsapi.readdir);
Comment thread
karthiknadig marked this conversation as resolved.
Outdated
const files = await readdir(pathToCheck);
Comment thread
karthiknadig marked this conversation as resolved.
Outdated
return files
.map((filename) => path.join(pathToCheck, filename))
.filter((fileName) => CheckPythonInterpreterRegEx.test(path.basename(fileName)));
} catch (err) {
traceError('Python Extension (lookForInterpretersInDirectory.fs.listdir):', err);
Expand Down