microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Open to side: do not first use fileService for resolving, since item is already part of explorer model

Browse Source 
fixes #109780
This commit is contained in:
isidor
2020-11-03 10:41:17 +01:00
parent 7601718ccc
commit e720530819
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/contrib/files/browser/fileCommands.ts
View File

@@ -134,9 +134,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
const untitledResources = resources.filter(resource => resource.scheme === Schemas.untitled);
const fileResources = resources.filter(resource => resource.scheme !== Schemas.untitled);
const resolved = await fileService.resolveAll(fileResources.map(resource => ({ resource })));
const editors = resolved.filter(r => r.stat && r.success && !r.stat.isDirectory).map(r => ({
resource: r.stat!.resource,
const items = await Promise.all(fileResources.map(async resource => {
const item = explorerService.findClosest(resource);
if (item) {
// Explorer already resolved the item, no need to go to the file service #109780
return item;
}
return await fileService.resolve(resource);
}));
const files = items.filter(i => !i.isDirectory);
const editors = files.map(f => ({
resource: f.resource,
options: { pinned: true }
})).concat(...untitledResources.map(untitledResource => ({ resource: untitledResource, options: { pinned: true } })));