maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9394 from ChristianAlexander/workspace-contains-directory

Browse source 
Allow workspaceContains to specify directories (fixes #8295).
This commit is contained in:
Alexandru Dima 2016-08-16 11:31:57 +02:00 committed by GitHub
parent ca979fc8b5 c474093b13
commit 02d72406d4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/base/node/pfs.ts
View file

@ -199,6 +199,13 @@ export function fileExistsWithResult<T>(path: string, successResult: T): TPromis
});
}
export function existsWithResult<T>(path: string, successResult: T): TPromise<T> {
return exists(path).then((exists) => {
return exists ? successResult : null;
}, (err) => {
return TPromise.wrapError(err);
});
}
function removeNull<T>(arr: T[]): T[] {
return arr.filter(item => (item !== null));

2
src/vs/workbench/node/extensionHostMain.ts
View file

@ -246,7 +246,7 @@ export class ExtensionHostMain {
return TPromise.join(
Object.keys(desiredFilesMap).map(
(fileName) => pfs.fileExistsWithResult(paths.join(folderPath, fileName), fileName)
(fileName) => pfs.existsWithResult(paths.join(folderPath, fileName), fileName)
)
).then((fileNames: string[]) => {
fileNames.forEach((existingFileName) => {