This commit is contained in:
Joao Moreno
2016-10-10 17:33:47 +02:00
parent 42a5c57451
commit 492264d2e2
2 changed files with 23 additions and 94 deletions

View File

@@ -183,9 +183,9 @@ export class ExtensionHostMain {
return TPromise.as(null);
}
let folderPath = workspace.resource.fsPath;
const folderPath = workspace.resource.fsPath;
let desiredFilesMap: {
const desiredFilesMap: {
[filename: string]: boolean;
} = {};
@@ -203,21 +203,17 @@ export class ExtensionHostMain {
}
});
return TPromise.join(
Object.keys(desiredFilesMap).map(
(fileName) => pfs.existsWithResult(paths.join(folderPath, fileName), fileName)
)
).then((fileNames: string[]) => {
fileNames.forEach((existingFileName) => {
if (!existingFileName) {
return;
}
const fileNames = Object.keys(desiredFilesMap);
let activationEvent = 'workspaceContains:' + existingFileName;
this._extensionService.activateByEvent(activationEvent).then(null, (err) => {
console.error(err);
return TPromise.join(fileNames.map(f => pfs.exists(paths.join(folderPath, f)))).then(exists => {
fileNames
.filter((f, i) => exists[i])
.forEach(fileName => {
const activationEvent = `workspaceContains:${fileName}`;
this._extensionService.activateByEvent(activationEvent)
.done(null, err => console.error(err));
});
});
});
}