@codingame/monaco-vscode-api 1.83.15 → 1.85.0-next.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;

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

@@ -12,8 +12,8 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { preventEditorClose, EditorResourceAccessor, SideBySideEditor, EditorCloseMethod } from '../../../../common/editor.js';
 import { SaveAllInGroupAction, CloseGroupAction } from '../fileActions.js';
 import { OpenEditor, OpenEditorsFocusedContext, ExplorerFocusedContext } from '../../common/files.js';
-import { CloseEditorAction, UnpinEditorAction } from '../../../../browser/parts/editor/editorActions.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { CloseEditorAction, UnpinEditorAction, CloseAllEditorsAction } from '../../../../browser/parts/editor/editorActions.js';
+import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
@@ -21,9 +21,9 @@ import { ResourceLabels } from '../../../../browser/labels.js';
 import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
 import { dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext } from '../fileConstants.js';
-import { ResourceContextKey } from '../../../../common/contextkeys.js';
+import { MenuId, registerAction2, Action2, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { OpenEditorsGroupContext, OpenEditorsDirtyEditorContext, OpenEditorsReadonlyEditorContext, SAVE_ALL_LABEL, SAVE_ALL_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID } from '../fileConstants.js';
+import { ResourceContextKey, MultipleEditorGroupsContext } from '../../../../common/contextkeys.js';
 import { containsDragType, CodeDataTransfers } from 'monaco-editor/esm/vs/platform/dnd/browser/dnd.js';
 import { ResourcesDropHandler, fillEditorsDragData } from '../../../../browser/dnd.js';
 import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
@@ -35,8 +35,11 @@ import { IFilesConfigurationService } from '../../../../services/filesConfigurat
 import { IViewDescriptorService } from '../../../../common/views.js';
 import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
 import { compareFileNamesDefault } from 'monaco-editor/esm/vs/base/common/comparers.js';
+import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
+import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { extUriIgnorePathCase } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 var OpenEditorsView_1;
 const $ = dom.$;
 let OpenEditorsView = class OpenEditorsView extends ViewPane {
@@ -44,7 +47,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     static { this.DEFAULT_VISIBLE_OPEN_EDITORS = 9; }
     static { this.DEFAULT_MIN_VISIBLE_OPEN_EDITORS = 0; }
     static { this.ID = 'workbench.explorer.openEditorsView'; }
-    static { this.NAME = ( nls.localizeWithPath(
+    static { this.NAME = ( nls.localize2WithPath(
         'vs/workbench/contrib/files/browser/views/openEditorsView',
         { key: 'openEditors', comment: ['Open is an adjective'] },
         "Open Editors"
@@ -56,6 +59,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.filesConfigurationService = filesConfigurationService;
         this.needsRefresh = false;
         this.elements = [];
+        this.blockFocusActiveEditorTracking = false;
         this.structuralRefreshDelay = 0;
         this.sortOrder = configurationService.getValue('explorer.openEditors.sortOrder');
         this.registerUpdateEvents();
@@ -82,26 +86,26 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                 }
                 const index = this.getIndex(group, e.editor);
                 switch (e.kind) {
-                    case 6 :
-                    case 0 :
+                    case 7 :
                         this.focusActiveEditor();
                         break;
                     case 1 :
+                    case 2 :
                         if (index >= 0) {
                             this.list.splice(index, 1, [group]);
                         }
                         break;
+                    case 12 :
                     case 11 :
+                    case 9 :
                     case 10 :
                     case 8 :
-                    case 9 :
-                    case 7 :
                         this.list.splice(index, 1, [( new OpenEditor(e.editor, group))]);
                         this.focusActiveEditor();
                         break;
-                    case 3 :
-                    case 5 :
                     case 4 :
+                    case 6 :
+                    case 5 :
                         updateWholeList();
                         break;
                 }
@@ -115,6 +119,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             updateWholeList();
         }));
         this._register(this.editorGroupService.onDidMoveGroup(() => updateWholeList()));
+        this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.focusActiveEditor()));
         this._register(this.editorGroupService.onDidRemoveGroup(group => {
             dispose(groupDisposables.get(group.id));
             updateWholeList();
@@ -215,17 +220,25 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             }
         }));
         this._register(this.list.onDidOpen(e => {
-            if (!e.element) {
+            const element = e.element;
+            if (!element) {
                 return;
             }
-            else if (e.element instanceof OpenEditor) {
-                if (e.browserEvent instanceof MouseEvent && e.browserEvent.button === 1) {
+            else if (element instanceof OpenEditor) {
+                if (dom.isMouseEvent(e.browserEvent) && e.browserEvent.button === 1) {
                     return;
                 }
-                this.openEditor(e.element, { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned, sideBySide: e.sideBySide });
+                this.withActiveEditorFocusTrackingDisabled(() => {
+                    this.openEditor(element, { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned, sideBySide: e.sideBySide });
+                });
             }
             else {
-                this.editorGroupService.activateGroup(e.element);
+                this.withActiveEditorFocusTrackingDisabled(() => {
+                    this.editorGroupService.activateGroup(element);
+                    if (!e.editorOptions.preserveFocus) {
+                        element.focus();
+                    }
+                });
             }
         }));
         this.listRefreshScheduler.schedule(0);
@@ -241,10 +254,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     }
     focus() {
         super.focus();
-        this.list.domFocus();
-    }
-    getList() {
-        return this.list;
+        this.list?.domFocus();
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
@@ -311,7 +321,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
             if (!preserveActivateGroup) {
                 this.editorGroupService.activateGroup(element.group);
             }
-            const targetGroup = options.sideBySide ? this.editorGroupService.sideGroup : this.editorGroupService.activeGroup;
+            const targetGroup = options.sideBySide ? this.editorGroupService.sideGroup : element.group;
             targetGroup.openEditor(element.editor, options);
         }
     }
@@ -323,12 +333,24 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.contextMenuService.showContextMenu({
             menuId: MenuId.OpenEditorsContext,
             menuActionOptions: { shouldForwardArgs: true, arg: element instanceof OpenEditor ? EditorResourceAccessor.getOriginalUri(element.editor) : {} },
-            contextKeyService: this.list.contextKeyService,
+            contextKeyService: this.list?.contextKeyService,
             getAnchor: () => e.anchor,
             getActionsContext: () => element instanceof OpenEditor ? { groupId: element.groupId, editorIndex: element.group.getIndexOfEditor(element.editor) } : { groupId: element.id }
         });
     }
+    withActiveEditorFocusTrackingDisabled(fn) {
+        this.blockFocusActiveEditorTracking = true;
+        try {
+            fn();
+        }
+        finally {
+            this.blockFocusActiveEditorTracking = false;
+        }
+    }
     focusActiveEditor() {
+        if (!this.list || this.blockFocusActiveEditorTracking) {
+            return;
+        }
         if (this.list.length && this.editorGroupService.activeGroup) {
             const index = this.getIndex(this.editorGroupService.activeGroup, this.editorGroupService.activeGroup.activeEditor);
             if (index >= 0) {
@@ -409,6 +431,9 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         this.structuralRefreshDelay = delay;
     }
     getOptimalWidth() {
+        if (!this.list) {
+            return super.getOptimalWidth();
+        }
         const parentNode = this.list.getHTMLElement();
         const childNodes = [].slice.call(parentNode.querySelectorAll('.open-editor > a'));
         return dom.getLargestChildWidth(parentNode, childNodes);
@@ -584,7 +609,7 @@ class OpenEditorsDragAndDrop {
             this.editorGroupService.activateGroup(group);
         }
         else {
-            this.dropHandler.handleDrop(originalEvent, () => group, () => group.focus(), { index });
+            this.dropHandler.handleDrop(originalEvent, mainWindow, () => group, () => group.focus(), { index });
         }
     }
     dispose() { }
@@ -608,8 +633,38 @@ class OpenEditorsAccessibilityProvider {
     }
 }
 const toggleEditorGroupLayoutId = 'workbench.action.toggleEditorGroupLayout';
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.toggleEditorGroupLayout',
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/files/browser/views/openEditorsView',
+                'flipLayout',
+                "Toggle Vertical/Horizontal Editor Layout"
+            )), original: 'Toggle Vertical/Horizontal Editor Layout' },
+            f1: true,
+            keybinding: {
+                primary: 1024  | 512  | 21 ,
+                mac: { primary: 2048  | 512  | 21  },
+                weight: 200
+            },
+            icon: Codicon.editorLayout,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', OpenEditorsView.ID)), MultipleEditorGroupsContext)),
+                order: 10
+            }
+        });
+    }
+    async run(accessor) {
+        const editorGroupService = accessor.get(IEditorGroupsService);
+        const newOrientation = ((editorGroupService.orientation === 1) ) ? 0  : 1 ;
+        editorGroupService.setGroupOrientation(newOrientation);
+    }
+});
 MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
-    group: '4_flip',
+    group: '5_flip',
     command: {
         id: toggleEditorGroupLayoutId,
         title: {
@@ -628,4 +683,69 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     },
     order: 1
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.files.saveAll',
+            title: { value: SAVE_ALL_LABEL, original: 'Save All' },
+            f1: true,
+            icon: Codicon.saveAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 20
+            }
+        });
+    }
+    async run(accessor) {
+        const commandService = accessor.get(ICommandService);
+        await commandService.executeCommand(SAVE_ALL_COMMAND_ID);
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'openEditors.closeAll',
+            title: CloseAllEditorsAction.LABEL,
+            f1: false,
+            icon: Codicon.closeAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 30
+            }
+        });
+    }
+    async run(accessor) {
+        const instantiationService = accessor.get(IInstantiationService);
+        const closeAll = ( new CloseAllEditorsAction());
+        await instantiationService.invokeFunction(accessor => closeAll.run(accessor));
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'openEditors.newUntitledFile',
+            title: { value: ( nls.localizeWithPath(
+                'vs/workbench/contrib/files/browser/views/openEditorsView',
+                'newUntitledFile',
+                "New Untitled Text File"
+            )), original: 'New Untitled Text File' },
+            f1: false,
+            icon: Codicon.newFile,
+            menu: {
+                id: MenuId.ViewTitle,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', OpenEditorsView.ID)),
+                order: 5
+            }
+        });
+    }
+    async run(accessor) {
+        const commandService = accessor.get(ICommandService);
+        await commandService.executeCommand(NEW_UNTITLED_FILE_COMMAND_ID);
+    }
+});
 export { OpenEditorsView };