From c474093b13a1431525f7bf38a58b6f0563c737b6 Mon Sep 17 00:00:00 2001 From: Christian Alexander Date: Sat, 16 Jul 2016 12:39:03 -0700 Subject: [PATCH] Allow workspaceContains to specify directories (fixes #8295). --- src/vs/base/node/pfs.ts | 7 +++++++ src/vs/workbench/node/extensionHostMain.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts index 703b0d9dfcd..d05f9caec2c 100644 --- a/src/vs/base/node/pfs.ts +++ b/src/vs/base/node/pfs.ts @@ -193,6 +193,13 @@ export function fileExistsWithResult(path: string, successResult: T): TPromis }); } +export function existsWithResult(path: string, successResult: T): TPromise { + return exists(path).then((exists) => { + return exists ? successResult : null; + }, (err) => { + return TPromise.wrapError(err); + }); +} function removeNull(arr: T[]): T[] { return arr.filter(item => (item !== null)); diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index d7ff2b383ec..3f399ef3181 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -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) => { -- GitLab