development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-26 20:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

#93366 Fix tests

Browse source
This commit is contained in:
Sandeep Somavarapu 2020-03-26 12:27:01 +01:00
parent 928e3e0188
commit 4cfc630dc1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/services/configuration/browser/configurationService.ts
View file

@ -156,7 +156,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
return false;
}
private doUpdateFolders(foldersToAdd: IWorkspaceFolderCreationData[], foldersToRemove: URI[], index?: number): Promise<void> {
private async doUpdateFolders(foldersToAdd: IWorkspaceFolderCreationData[], foldersToRemove: URI[], index?: number): Promise<void> {
if (this.getWorkbenchState() !== WorkbenchState.WORKSPACE) {
return Promise.resolve(undefined); // we need a workspace to begin with
}
@ -192,7 +192,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
const storedFoldersToAdd: IStoredWorkspaceFolder[] = [];
foldersToAdd.forEach(async folderToAdd => {
await Promise.all(foldersToAdd.map(async folderToAdd => {
const folderURI = folderToAdd.uri;
if (this.contains(currentWorkspaceFolderUris, folderURI)) {
return; // already existing
@ -204,7 +204,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
}
} catch (e) { /* Ignore */ }
storedFoldersToAdd.push(getStoredWorkspaceFolder(folderURI, folderToAdd.name, workspaceConfigFolder, slashForPath));
});
}));
// Apply to array of newStoredFolders
if (storedFoldersToAdd.length > 0) {
@ -623,10 +623,11 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
for (const workspaceFolder of workspaceFolders) {
try {
const result = await this.fileService.resolve(workspaceFolder.uri);
if (result.isDirectory) {
validWorkspaceFolders.push(workspaceFolder);
if (!result.isDirectory) {
continue;
}
} catch (e) { /* Ignore */ }
validWorkspaceFolders.push(workspaceFolder);
}
return validWorkspaceFolders;
}