@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js

@@ -19,7 +19,7 @@ import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspac
 import { extractEditorsAndFilesDropData } from 'monaco-editor/esm/vs/platform/dnd/browser/dnd.js';
 import { IWorkspaceEditingService } from '../../../services/workspaces/common/workspaceEditing.js';
 import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { triggerDownload } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { isDragEvent, getActiveWindow, triggerDownload } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { FileAccess, Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { mnemonicButtonLabel } from 'monaco-editor/esm/vs/base/common/labels.js';
@@ -60,7 +60,7 @@ let BrowserFileUpload = class BrowserFileUpload {
         return uploadPromise;
     }
     toTransfer(source) {
-        if (source instanceof DragEvent) {
+        if (isDragEvent(source)) {
             return source.dataTransfer;
         }
         const transfer = { items: [] };
@@ -306,7 +306,7 @@ let ExternalFileImport = class ExternalFileImport {
         this.notificationService = notificationService;
         this.instantiationService = instantiationService;
     }
-    async import(target, source) {
+    async import(target, source, targetWindow) {
         const cts = ( new CancellationTokenSource());
         const importPromise = this.progressService.withProgress({
             location: 10 ,
@@ -317,11 +317,11 @@ let ExternalFileImport = class ExternalFileImport {
                 'copyingFiles',
                 "Copying..."
             ))
-        }, async () => await this.doImport(target, source, cts.token), () => cts.dispose(true));
+        }, async () => await this.doImport(target, source, targetWindow, cts.token), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => importPromise);
         return importPromise;
     }
-    async doImport(target, source, token) {
+    async doImport(target, source, targetWindow, token) {
         const candidateFiles = coalesce(( (await this.instantiationService.invokeFunction(accessor => extractEditorsAndFilesDropData(accessor, source))).map(editor => editor.resource)));
         await Promise.all(( candidateFiles.map(resource => this.fileService.activateProvider(resource.scheme))));
         const files = coalesce(candidateFiles.filter(resource => this.fileService.hasProvider(resource)));
@@ -329,7 +329,7 @@ let ExternalFileImport = class ExternalFileImport {
         if (token.isCancellationRequested) {
             return;
         }
-        this.hostService.focus();
+        this.hostService.focus(targetWindow);
         const folders = ( resolvedFiles.filter(resolvedFile => resolvedFile.success && resolvedFile.stat?.isDirectory).map(resolvedFile => ({ uri: resolvedFile.stat.resource })));
         if (folders.length > 0 && target.isRoot) {
             let ImportChoice;
@@ -557,9 +557,10 @@ let FileDownload = class FileDownload {
         }
         const maxBlobDownloadSize = 32 * ByteSize.MB;
         const preferFileSystemAccessWebApis = stat.isDirectory || stat.size > maxBlobDownloadSize;
-        if (preferFileSystemAccessWebApis && WebFileSystemAccess.supported(window)) {
+        const activeWindow = getActiveWindow();
+        if (preferFileSystemAccessWebApis && WebFileSystemAccess.supported(activeWindow)) {
             try {
-                const parentFolder = await window.showDirectoryPicker();
+                const parentFolder = await activeWindow.showDirectoryPicker();
                 const operation = {
                     startTime: Date.now(),
                     progressScheduler: ( new RunOnceWorker(steps => { progress.report(steps[steps.length - 1]); }, 1000)),

package/vscode/src/vs/workbench/contrib/files/browser/files.contribution.js

@@ -596,6 +596,15 @@ configurationRegistry.registerConfiguration({
             )),
             'default': true
         },
+        'explorer.confirmPasteNative': {
+            'type': 'boolean',
+            'description': ( nls.localizeWithPath(
+                'vs/workbench/contrib/files/browser/files.contribution',
+                'confirmPasteNative',
+                "Controls whether the Explorer should ask for confirmation when pasting native files and folders."
+            )),
+            'default': true
+        },
         'explorer.confirmDelete': {
             'type': 'boolean',
             'description': ( nls.localizeWithPath(
@@ -765,7 +774,7 @@ configurationRegistry.registerConfiguration({
             description: ( nls.localizeWithPath(
                 'vs/workbench/contrib/files/browser/files.contribution',
                 'explorer.incrementalNaming',
-                "Controls what naming strategy to use when a giving a new name to a duplicated Explorer item on paste."
+                "Controls which naming strategy to use when giving a new name to a duplicated Explorer item on paste."
             )),
             default: 'simple'
         },

package/vscode/src/vs/workbench/contrib/files/browser/files.d.ts

@@ -39,6 +39,7 @@ interface IExplorerService {
 }
 declare const IExplorerService: ServiceIdentifier<IExplorerService>;
 interface IExplorerView {
+    autoReveal: boolean | 'force' | 'focusNoScroll';
     getContext(respectMultiSelection: boolean): ExplorerItem[];
     refresh(recursive: boolean, item?: ExplorerItem): Promise<void>;
     selectResource(resource: URI | undefined, reveal?: boolean | string): Promise<void>;

package/vscode/src/vs/workbench/contrib/files/browser/files.js

@@ -6,10 +6,12 @@ import { ExplorerItem } from '../common/explorerModel.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { AsyncDataTree } from 'monaco-editor/esm/vs/base/browser/ui/tree/asyncDataTree.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { isActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 const IExplorerService = ( createDecorator('explorerService'));
 function getFocus(listService) {
     const list = listService.lastFocusedList;
-    if (list?.getHTMLElement() === document.activeElement) {
+    const element = list?.getHTMLElement();
+    if (element && isActiveElement(element)) {
         let focus;
         if (list instanceof List) {
             const focused = list.getFocusedElements();
@@ -42,7 +44,8 @@ function getResourceForCommand(resource, listService, editorService) {
 }
 function getMultiSelectedResources(resource, listService, editorService, explorerService) {
     const list = listService.lastFocusedList;
-    if (list?.getHTMLElement() === document.activeElement) {
+    const element = list?.getHTMLElement();
+    if (element && isActiveElement(element)) {
         if (list instanceof AsyncDataTree && list.getFocus().every(item => item instanceof ExplorerItem)) {
             const context = explorerService.getContext(true, true);
             if (context.length) {
@@ -71,7 +74,8 @@ function getMultiSelectedResources(resource, listService, editorService, explore
 }
 function getOpenEditorsViewMultiSelection(listService, editorGroupService) {
     const list = listService.lastFocusedList;
-    if (list?.getHTMLElement() === document.activeElement) {
+    const element = list?.getHTMLElement();
+    if (element && isActiveElement(element)) {
         if (list instanceof List) {
             const selection = coalesce(list.getSelectedElements().filter(s => s instanceof OpenEditor));
             const focusedElements = list.getFocusedElements();

package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js

@@ -15,12 +15,12 @@ import { IViewDescriptorService } from '../../../../common/views.js';
 import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { DragAndDropObserver } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { DragAndDropObserver, getWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
 var EmptyView_1;
 let EmptyView = class EmptyView extends ViewPane {
     static { EmptyView_1 = this; }
     static { this.ID = 'workbench.explorer.emptyView'; }
-    static { this.NAME = ( nls.localizeWithPath(
+    static { this.NAME = ( nls.localize2WithPath(
         'vs/workbench/contrib/files/browser/views/emptyView',
         'noWorkspace',
         "No Folder Opened"
@@ -42,7 +42,7 @@ let EmptyView = class EmptyView extends ViewPane {
             onDrop: e => {
                 container.style.backgroundColor = '';
                 const dropHandler = this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: !isWeb || isTemporaryWorkspace(this.contextService.getWorkspace()) });
-                dropHandler.handleDrop(e);
+                dropHandler.handleDrop(e, getWindow(container));
             },
             onDragEnter: () => {
                 const color = this.themeService.getColorTheme().getColor(listDropBackground);
@@ -67,7 +67,7 @@ let EmptyView = class EmptyView extends ViewPane {
             return;
         }
         if (this.contextService.getWorkbenchState() === 3 ) {
-            this.updateTitle(EmptyView_1.NAME);
+            this.updateTitle(EmptyView_1.NAME.value);
         }
         else {
             this.updateTitle(this.title);

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js

@@ -79,11 +79,13 @@ function getContext(focus, selection, respectMultiSelection, compressedNavigatio
     if (respectMultiSelection && selection.length > 1) {
         focusedStat = undefined;
     }
-    const compressedNavigationController = focusedStat && compressedNavigationControllerProvider.getCompressedNavigationController(focusedStat);
+    const compressedNavigationControllers = focusedStat && compressedNavigationControllerProvider.getCompressedNavigationController(focusedStat);
+    const compressedNavigationController = compressedNavigationControllers && compressedNavigationControllers.length ? compressedNavigationControllers[0] : undefined;
     focusedStat = compressedNavigationController ? compressedNavigationController.current : focusedStat;
     const selectedStats = [];
     for (const stat of selection) {
-        const controller = compressedNavigationControllerProvider.getCompressedNavigationController(stat);
+        const controllers = compressedNavigationControllerProvider.getCompressedNavigationController(stat);
+        const controller = controllers && controllers.length ? controllers[0] : undefined;
         if (controller && focusedStat && controller === compressedNavigationController) {
             if (stat === focusedStat) {
                 selectedStats.push(stat);
@@ -128,7 +130,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
         this.commandService = commandService;
-        this.autoReveal = false;
+        this._autoReveal = false;
         this.delegate = options.delegate;
         this.resourceContext = instantiationService.createInstance(ResourceContextKey);
         this._register(this.resourceContext);
@@ -144,6 +146,12 @@ let ExplorerView = class ExplorerView extends ViewPane {
         this.viewVisibleContextKey = FoldersViewVisibleContext.bindTo(contextKeyService);
         this.explorerService.registerView(this);
     }
+    get autoReveal() {
+        return this._autoReveal;
+    }
+    set autoReveal(autoReveal) {
+        this._autoReveal = autoReveal;
+    }
     get name() {
         return this.labelService.getWorkspaceLabel(this.contextService.getWorkspace());
     }
@@ -207,16 +215,23 @@ let ExplorerView = class ExplorerView extends ViewPane {
                 this.selectActiveFile(true);
             }
         }));
+        this._register(dom.addDisposableListener(dom.getWindow(this.container), dom.EventType.PASTE, async (event) => {
+            if (!this.hasFocus() || this.readonlyContext.get()) {
+                return;
+            }
+            await this.commandService.executeCommand('filesExplorer.paste', event.clipboardData?.files);
+        }));
     }
     focus() {
+        super.focus();
         this.tree.domFocus();
         const focused = this.tree.getFocus();
-        if (focused.length === 1 && this.autoReveal) {
+        if (focused.length === 1 && this._autoReveal) {
             this.tree.reveal(focused[0], 0.5);
         }
     }
     hasFocus() {
-        return dom.isAncestor(document.activeElement, this.container);
+        return dom.isAncestorOfActiveElement(this.container);
     }
     getContext(respectMultiSelection) {
         return getContext(this.tree.getFocus(), this.tree.getSelection(), respectMultiSelection, this.renderer);
@@ -254,8 +269,8 @@ let ExplorerView = class ExplorerView extends ViewPane {
             this.tree.domFocus();
         }
     }
-    selectActiveFile(reveal = this.autoReveal) {
-        if (this.autoReveal) {
+    async selectActiveFile(reveal = this._autoReveal) {
+        if (this._autoReveal) {
             const activeFile = EditorResourceAccessor.getCanonicalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
             if (activeFile) {
                 const focus = this.tree.getFocus();
@@ -263,7 +278,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
                 if (focus.length === 1 && this.uriIdentityService.extUri.isEqual(focus[0].resource, activeFile) && selection.length === 1 && this.uriIdentityService.extUri.isEqual(selection[0].resource, activeFile)) {
                     return;
                 }
-                this.explorerService.select(activeFile, reveal);
+                return this.explorerService.select(activeFile, reveal);
             }
         }
     }
@@ -339,7 +354,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
             if (!element) {
                 return;
             }
-            const shiftDown = e.browserEvent instanceof KeyboardEvent && e.browserEvent.shiftKey;
+            const shiftDown = dom.isKeyboardEvent(e.browserEvent) && e.browserEvent.shiftKey;
             if (!shiftDown) {
                 if (element.isDirectory || this.explorerService.isEditable(undefined)) {
                     return;
@@ -364,8 +379,8 @@ let ExplorerView = class ExplorerView extends ViewPane {
         this._register(this.tree.onDidChangeCollapseState(e => {
             const element = e.node.element?.element;
             if (element) {
-                const navigationController = this.renderer.getCompressedNavigationController(element instanceof Array ? element[0] : element);
-                navigationController?.updateCollapsed(e.node.collapsed);
+                const navigationControllers = this.renderer.getCompressedNavigationController(element instanceof Array ? element[0] : element);
+                navigationControllers?.forEach(controller => controller.updateCollapsed(e.node.collapsed));
             }
             this.updateAnyCollapsedContext();
         }));
@@ -383,7 +398,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
     onConfigurationUpdated(event) {
         if (!event || event.affectsConfiguration('explorer.autoReveal')) {
             const configuration = this.configurationService.getValue();
-            this.autoReveal = configuration?.explorer?.autoReveal;
+            this._autoReveal = configuration?.explorer?.autoReveal;
         }
         if (event && (event.affectsConfiguration('explorer.decorations.colors') || event.affectsConfiguration('explorer.decorations.badges'))) {
             this.refresh(true);
@@ -414,15 +429,15 @@ let ExplorerView = class ExplorerView extends ViewPane {
         }
         const stat = e.element;
         let anchor = e.anchor;
-        if (dom.isHTMLElement(anchor)) {
+        if (anchor instanceof HTMLElement) {
             if (stat) {
-                const controller = this.renderer.getCompressedNavigationController(stat);
-                if (controller) {
-                    if (e.browserEvent instanceof KeyboardEvent || isCompressedFolderName(e.browserEvent.target)) {
-                        anchor = controller.labels[controller.index];
+                const controllers = this.renderer.getCompressedNavigationController(stat);
+                if (controllers && controllers.length > 0) {
+                    if (dom.isKeyboardEvent(e.browserEvent) || isCompressedFolderName(e.browserEvent.target)) {
+                        anchor = controllers[0].labels[controllers[0].index];
                     }
                     else {
-                        controller.last();
+                        controllers.forEach(controller => controller.last());
                     }
                 }
             }
@@ -433,8 +448,8 @@ let ExplorerView = class ExplorerView extends ViewPane {
         const roots = this.explorerService.roots;
         let arg;
         if (stat instanceof ExplorerItem) {
-            const compressedController = this.renderer.getCompressedNavigationController(stat);
-            arg = compressedController ? compressedController.current.resource : stat.resource;
+            const compressedControllers = this.renderer.getCompressedNavigationController(stat);
+            arg = compressedControllers && compressedControllers.length ? compressedControllers[0].current.resource : stat.resource;
         }
         else {
             arg = roots.length === 1 ? roots[0].resource : {};
@@ -465,13 +480,15 @@ let ExplorerView = class ExplorerView extends ViewPane {
         else {
             this.resourceMoveableToTrash.reset();
         }
-        const compressedNavigationController = stat && this.renderer.getCompressedNavigationController(stat);
-        if (!compressedNavigationController) {
+        const compressedNavigationControllers = stat && this.renderer.getCompressedNavigationController(stat);
+        if (!compressedNavigationControllers) {
             this.compressedFocusContext.set(false);
             return;
         }
         this.compressedFocusContext.set(true);
-        this.updateCompressedNavigationContextKeys(compressedNavigationController);
+        compressedNavigationControllers.forEach(controller => {
+            this.updateCompressedNavigationContextKeys(controller);
+        });
     }
     refresh(recursive, item, cancelEditing = true) {
         if (!this.tree || !this.isBodyVisible() || (item && !this.tree.hasNode(item))) {
@@ -557,13 +574,16 @@ let ExplorerView = class ExplorerView extends ViewPane {
             this._register(this.decorationService.registerDecorationsProvider(this.decorationsProvider));
         }
     }
-    async selectResource(resource, reveal = this.autoReveal, retry = 0) {
+    async selectResource(resource, reveal = this._autoReveal, retry = 0) {
         if (retry === 2) {
             return;
         }
         if (!resource || !this.isBodyVisible()) {
             return;
         }
+        if (this.setTreeInputPromise) {
+            await this.setTreeInputPromise;
+        }
         let item = this.explorerService.findClosestRoot(resource);
         while (item && ( item.resource.toString()) !== ( resource.toString())) {
             try {
@@ -635,36 +655,44 @@ let ExplorerView = class ExplorerView extends ViewPane {
         if (!focused.length) {
             return;
         }
-        const compressedNavigationController = this.renderer.getCompressedNavigationController(focused[0]);
-        compressedNavigationController.previous();
-        this.updateCompressedNavigationContextKeys(compressedNavigationController);
+        const compressedNavigationControllers = this.renderer.getCompressedNavigationController(focused[0]);
+        compressedNavigationControllers.forEach(controller => {
+            controller.previous();
+            this.updateCompressedNavigationContextKeys(controller);
+        });
     }
     nextCompressedStat() {
         const focused = this.tree.getFocus();
         if (!focused.length) {
             return;
         }
-        const compressedNavigationController = this.renderer.getCompressedNavigationController(focused[0]);
-        compressedNavigationController.next();
-        this.updateCompressedNavigationContextKeys(compressedNavigationController);
+        const compressedNavigationControllers = this.renderer.getCompressedNavigationController(focused[0]);
+        compressedNavigationControllers.forEach(controller => {
+            controller.next();
+            this.updateCompressedNavigationContextKeys(controller);
+        });
     }
     firstCompressedStat() {
         const focused = this.tree.getFocus();
         if (!focused.length) {
             return;
         }
-        const compressedNavigationController = this.renderer.getCompressedNavigationController(focused[0]);
-        compressedNavigationController.first();
-        this.updateCompressedNavigationContextKeys(compressedNavigationController);
+        const compressedNavigationControllers = this.renderer.getCompressedNavigationController(focused[0]);
+        compressedNavigationControllers.forEach(controller => {
+            controller.first();
+            this.updateCompressedNavigationContextKeys(controller);
+        });
     }
     lastCompressedStat() {
         const focused = this.tree.getFocus();
         if (!focused.length) {
             return;
         }
-        const compressedNavigationController = this.renderer.getCompressedNavigationController(focused[0]);
-        compressedNavigationController.last();
-        this.updateCompressedNavigationContextKeys(compressedNavigationController);
+        const compressedNavigationControllers = this.renderer.getCompressedNavigationController(focused[0]);
+        compressedNavigationControllers.forEach(controller => {
+            controller.last();
+            this.updateCompressedNavigationContextKeys(controller);
+        });
     }
     updateCompressedNavigationContextKeys(controller) {
         this.compressedFocusFirstContext.set(controller.index === 0);

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js

@@ -46,6 +46,8 @@ import { defaultInputBoxStyles } from 'monaco-editor/esm/vs/platform/theme/brows
 import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IHoverService } from '../../../../services/hover/browser/hover.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { explorerFileContribRegistry } from '../explorerFileContrib.js';
 import { getFileNamesMessage, IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 var FilesRenderer_1, FileDragAndDrop_1;
 class ExplorerDelegate {
@@ -208,7 +210,7 @@ class CompressedNavigationController {
 let FilesRenderer = class FilesRenderer {
     static { FilesRenderer_1 = this; }
     static { this.ID = 'file'; }
-    constructor(container, labels, updateWidth, contextViewService, themeService, configurationService, explorerService, labelService, contextService, contextMenuService, hoverService) {
+    constructor(container, labels, updateWidth, contextViewService, themeService, configurationService, explorerService, labelService, contextService, contextMenuService, hoverService, instantiationService) {
         this.labels = labels;
         this.updateWidth = updateWidth;
         this.contextViewService = contextViewService;
@@ -219,6 +221,7 @@ let FilesRenderer = class FilesRenderer {
         this.contextService = contextService;
         this.contextMenuService = contextMenuService;
         this.hoverService = hoverService;
+        this.instantiationService = instantiationService;
         this.compressedNavigationControllers = ( new Map());
         this._onDidChangeActiveDescendant = ( new EventMultiplexer());
         this.onDidChangeActiveDescendant = this._onDidChangeActiveDescendant.event;
@@ -263,12 +266,16 @@ let FilesRenderer = class FilesRenderer {
                 return overflowed ? this.hoverService.showHover({
                     ...options,
                     target: indentGuideElement,
-                    compact: true,
                     container: listRow,
                     additionalClasses: ['explorer-item-hover'],
-                    skipFadeInAnimation: true,
-                    showPointer: false,
-                    hoverPosition: 1 ,
+                    position: {
+                        hoverPosition: 1 ,
+                    },
+                    appearance: {
+                        compact: true,
+                        skipFadeInAnimation: true,
+                        showPointer: false,
+                    }
                 }, focus) : undefined;
             }
             onDidHideHover() {
@@ -317,7 +324,8 @@ let FilesRenderer = class FilesRenderer {
             catch (e) {
             }
         }));
-        const templateData = { templateDisposables, elementDisposables: templateDisposables.add(( new DisposableStore())), label, container };
+        const contribs = explorerFileContribRegistry.create(this.instantiationService, container, templateDisposables);
+        const templateData = { templateDisposables, elementDisposables: templateDisposables.add(( new DisposableStore())), label, container, contribs };
         return templateData;
     }
     renderElement(node, index, templateData) {
@@ -331,6 +339,7 @@ let FilesRenderer = class FilesRenderer {
         }
         else {
             templateData.label.element.style.display = 'none';
+            templateData.contribs.forEach(c => c.setResource(undefined));
             templateData.elementDisposables.add(this.renderInputBox(templateData.container, stat, editableData));
         }
     }
@@ -347,7 +356,8 @@ let FilesRenderer = class FilesRenderer {
             this.renderStat(stat, label, id, node.filterData, templateData);
             const compressedNavigationController = ( new CompressedNavigationController(id, node.element.elements, templateData, node.depth, node.collapsed));
             templateData.elementDisposables.add(compressedNavigationController);
-            this.compressedNavigationControllers.set(stat, compressedNavigationController);
+            const nodeControllers = this.compressedNavigationControllers.get(stat) ?? [];
+            this.compressedNavigationControllers.set(stat, [...nodeControllers, compressedNavigationController]);
             templateData.elementDisposables.add(this._onDidChangeActiveDescendant.add(compressedNavigationController.onDidChange));
             templateData.elementDisposables.add(dom.addDisposableListener(templateData.container, 'mousedown', e => {
                 const result = getIconLabelNameFromHTMLElement(e.target);
@@ -355,11 +365,24 @@ let FilesRenderer = class FilesRenderer {
                     compressedNavigationController.setIndex(result.index);
                 }
             }));
-            templateData.elementDisposables.add(toDisposable(() => this.compressedNavigationControllers.delete(stat)));
+            templateData.elementDisposables.add(toDisposable(() => {
+                const nodeControllers = this.compressedNavigationControllers.get(stat) ?? [];
+                const renderedIndex = nodeControllers.findIndex(controller => controller === compressedNavigationController);
+                if (renderedIndex < 0) {
+                    throw new Error('Disposing unknown navigation controller');
+                }
+                if (nodeControllers.length === 1) {
+                    this.compressedNavigationControllers.delete(stat);
+                }
+                else {
+                    nodeControllers.splice(renderedIndex, 1);
+                }
+            }));
         }
         else {
             templateData.label.element.classList.remove('compressed');
             templateData.label.element.style.display = 'none';
+            templateData.contribs.forEach(c => c.setResource(undefined));
             templateData.elementDisposables.add(this.renderInputBox(templateData.container, editable[0], editableData));
         }
     }
@@ -375,6 +398,7 @@ let FilesRenderer = class FilesRenderer {
         const themeIsUnhappyWithNesting = theme.hasFileIcons && (theme.hidesExplorerArrows || !theme.hasFolderIcons);
         const realignNestedChildren = stat.nestedParent && themeIsUnhappyWithNesting;
         const experimentalHover = this.configurationService.getValue('explorer.experimental.hover');
+        templateData.contribs.forEach(c => c.setResource(stat.resource));
         templateData.label.setResource({ resource: stat.resource, name: label }, {
             title: experimentalHover ? isStringArray(label) ? label[0] : label : undefined,
             fileKind: stat.isRoot ? FileKind.ROOT_FOLDER : stat.isDirectory ? FileKind.FOLDER : FileKind.FILE,
@@ -492,13 +516,14 @@ let FilesRenderer = class FilesRenderer {
             dom.addDisposableListener(inputBox.inputElement, dom.EventType.BLUR, async () => {
                 while (true) {
                     await timeout(0);
-                    if (!document.hasFocus()) {
+                    const ownerDocument = inputBox.inputElement.ownerDocument;
+                    if (!ownerDocument.hasFocus()) {
                         break;
                     }
-                    if (document.activeElement === inputBox.inputElement) {
+                    if (dom.isActiveElement(inputBox.inputElement)) {
                         return;
                     }
-                    else if (document.activeElement instanceof HTMLElement && dom.hasParentWithClass(document.activeElement, 'context-view')) {
+                    else if (ownerDocument.activeElement instanceof HTMLElement && dom.hasParentWithClass(ownerDocument.activeElement, 'context-view')) {
                         await Event.toPromise(this.contextMenuService.onDidHideContextMenu);
                     }
                     else {
@@ -543,8 +568,7 @@ let FilesRenderer = class FilesRenderer {
         return depth;
     }
     getActiveDescendantId(stat) {
-        const compressedNavigationController = this.compressedNavigationControllers.get(stat);
-        return compressedNavigationController?.currentId;
+        return this.compressedNavigationControllers.get(stat)?.[0]?.currentId ?? undefined;
     }
     dispose() {
         this.configListener.dispose();
@@ -558,7 +582,8 @@ FilesRenderer = FilesRenderer_1 = ( __decorate([
     ( __param(7, ILabelService)),
     ( __param(8, IWorkspaceContextService)),
     ( __param(9, IContextMenuService)),
-    ( __param(10, IHoverService))
+    ( __param(10, IHoverService)),
+    ( __param(11, IInstantiationService))
 ], FilesRenderer));
 let FilesFilter = class FilesFilter {
     constructor(contextService, configurationService, explorerService, editorService, uriIdentityService, fileService) {
@@ -985,9 +1010,9 @@ let FileDragAndDrop = class FileDragAndDrop {
         }
         try {
             if (data instanceof NativeDragAndDropData) {
-                if (!isWeb || (isTemporaryWorkspace(this.contextService.getWorkspace()) && WebFileSystemAccess.supported(window))) {
+                if (!isWeb || (isTemporaryWorkspace(this.contextService.getWorkspace()) && WebFileSystemAccess.supported(mainWindow))) {
                     const fileImport = this.instantiationService.createInstance(ExternalFileImport);
-                    await fileImport.import(resolvedTarget, originalEvent);
+                    await fileImport.import(resolvedTarget, originalEvent, mainWindow);
                 }
                 else {
                     const browserUpload = this.instantiationService.createInstance(BrowserFileUpload);
@@ -1189,7 +1214,7 @@ let FileDragAndDrop = class FileDragAndDrop {
         return data.elements;
     }
     static getCompressedStatFromDragEvent(stat, dragEvent) {
-        const target = document.elementFromPoint(dragEvent.clientX, dragEvent.clientY);
+        const target = dom.getWindow(dragEvent).document.elementFromPoint(dragEvent.clientX, dragEvent.clientY);
         const iconLabelName = getIconLabelNameFromHTMLElement(target);
         if (iconLabelName) {
             const { count, index } = iconLabelName;