ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 6fded8a497cd0142de3a1c607649a5423a091a25

Browse Source
This commit is contained in:
ADS Merger
2020-04-04 04:30:52 +00:00
parent 00cc0074f7
commit 35f1a014d5
184 changed files with 3043 additions and 2285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/services/configuration/browser/configurationService.ts
View File

@@ -192,19 +192,19 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
const storedFoldersToAdd: IStoredWorkspaceFolder[] = [];
await Promise.all(foldersToAdd.map(async folderToAdd => {
for (const folderToAdd of foldersToAdd) {
const folderURI = folderToAdd.uri;
if (this.contains(currentWorkspaceFolderUris, folderURI)) {
return; // already existing
continue; // already existing
}
try {
const result = await this.fileService.resolve(folderURI);
if (!result.isDirectory) {
return;
continue;
}
} catch (e) { /* Ignore */ }
storedFoldersToAdd.push(getStoredWorkspaceFolder(folderURI, false, folderToAdd.name, workspaceConfigFolder, slashForPath));
}));
}
// Apply to array of newStoredFolders
if (storedFoldersToAdd.length > 0) {