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

package/vscode/src/vs/workbench/browser/dnd.js

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { DataTransfers } from 'monaco-editor/esm/vs/base/browser/dnd.js';
-import { DragAndDropObserver, addDisposableListener, EventType } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { onDidRegisterWindow, addDisposableListener, EventType, DragAndDropObserver } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { UriList } from 'monaco-editor/esm/vs/base/common/dataTransfer.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable, markAsSingleton, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { stringify } from 'monaco-editor/esm/vs/base/common/marshalling.js';
 import { Mimes } from 'monaco-editor/esm/vs/base/common/mime.js';
@@ -24,6 +24,8 @@ import { IEditorService } from '../services/editor/common/editorService.js';
 import { IHostService } from '../services/host/browser/host.js';
 import { ITextFileService } from '../services/textfile/common/textfiles.js';
 import { IWorkspaceEditingService } from '../services/workspaces/common/workspaceEditing.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { BroadcastDataChannel } from '../../base/browser/broadcast.js';
 class DraggedEditorIdentifier {
     constructor(identifier) {
         this.identifier = identifier;
@@ -59,12 +61,12 @@ let ResourcesDropHandler = class ResourcesDropHandler {
         this.contextService = contextService;
         this.instantiationService = instantiationService;
     }
-    async handleDrop(event, resolveTargetGroup, afterDrop, options) {
+    async handleDrop(event, targetWindow, resolveTargetGroup, afterDrop, options) {
         const editors = await this.instantiationService.invokeFunction(accessor => extractEditorsAndFilesDropData(accessor, event));
         if (!editors.length) {
             return;
         }
-        await this.hostService.focus();
+        await this.hostService.focus(targetWindow);
         if (this.options.allowWorkspaceOpen) {
             const localFilesAllowedToOpenAsWorkspace = coalesce(( editors.filter(editor => editor.allowWorkspaceOpen && editor.resource?.scheme === Schemas.file).map(editor => editor.resource)));
             if (localFilesAllowedToOpenAsWorkspace.length > 0) {
@@ -111,7 +113,6 @@ let ResourcesDropHandler = class ResourcesDropHandler {
         if (toOpen.length === 0) {
             return false;
         }
-        this.hostService.focus();
         if (toOpen.length > folderURIs.length || folderURIs.length === 1) {
             await this.hostService.openWindow(toOpen);
         }
@@ -133,7 +134,7 @@ ResourcesDropHandler = ( __decorate([
     ( __param(6, IWorkspaceContextService)),
     ( __param(7, IInstantiationService))
 ], ResourcesDropHandler));
-function fillEditorsDragData(accessor, resourcesOrEditors, event) {
+function fillEditorsDragData(accessor, resourcesOrEditors, event, options) {
     if (resourcesOrEditors.length === 0 || !event.dataTransfer) {
         return;
     }
@@ -154,13 +155,15 @@ function fillEditorsDragData(accessor, resourcesOrEditors, event) {
         return resourceOrEditor;
     })));
     const fileSystemResources = resources.filter(({ resource }) => fileService.hasProvider(resource));
-    const lineDelimiter = isWindows ? '\r\n' : '\n';
-    event.dataTransfer.setData(DataTransfers.TEXT, ( fileSystemResources.map(({ resource }) => labelService.getUriLabel(resource, { noPrefix: true }))).join(lineDelimiter));
-    const firstFile = fileSystemResources.find(({ isDirectory }) => !isDirectory);
-    if (firstFile) {
-        const firstFileUri = FileAccess.uriToFileUri(firstFile.resource);
-        if (firstFileUri.scheme === Schemas.file) {
-            event.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [Mimes.binary, basename(firstFile.resource), ( firstFileUri.toString())].join(':'));
+    if (!options?.disableStandardTransfer) {
+        const lineDelimiter = isWindows ? '\r\n' : '\n';
+        event.dataTransfer.setData(DataTransfers.TEXT, ( fileSystemResources.map(({ resource }) => labelService.getUriLabel(resource, { noPrefix: true }))).join(lineDelimiter));
+        const firstFile = fileSystemResources.find(({ isDirectory }) => !isDirectory);
+        if (firstFile) {
+            const firstFileUri = FileAccess.uriToFileUri(firstFile.resource);
+            if (firstFileUri.scheme === Schemas.file) {
+                event.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [Mimes.binary, basename(firstFile.resource), ( firstFileUri.toString())].join(':'));
+            }
         }
     }
     const files = fileSystemResources.filter(({ isDirectory }) => !isDirectory);
@@ -246,7 +249,9 @@ function fillEditorsDragData(accessor, resourcesOrEditors, event) {
                 uriListEntries.push(editor.result.resource);
             }
         }
-        event.dataTransfer.setData(Mimes.uriList, UriList.create(uriListEntries.slice(0, 1)));
+        if (!options?.disableStandardTransfer) {
+            event.dataTransfer.setData(Mimes.uriList, UriList.create(uriListEntries.slice(0, 1)));
+        }
         event.dataTransfer.setData(DataTransfers.INTERNAL_URI_LIST, UriList.create(uriListEntries));
     }
 }
@@ -314,8 +319,6 @@ class CompositeDragAndDropObserver extends Disposable {
     registerTarget(element, callbacks) {
         const disposableStore = ( new DisposableStore());
         disposableStore.add(( new DragAndDropObserver(element, {
-            onDragEnd: e => {
-            },
             onDragEnter: e => {
                 e.preventDefault();
                 if (callbacks.onDragEnter) {
@@ -367,13 +370,13 @@ class CompositeDragAndDropObserver extends Disposable {
     registerDraggable(element, draggedItemProvider, callbacks) {
         element.draggable = true;
         const disposableStore = ( new DisposableStore());
-        disposableStore.add(addDisposableListener(element, EventType.DRAG_START, e => {
-            const { id, type } = draggedItemProvider();
-            this.writeDragData(id, type);
-            e.dataTransfer?.setDragImage(element, 0, 0);
-            this.onDragStart.fire({ eventData: e, dragAndDropData: this.readDragData(type) });
-        }));
         disposableStore.add(( new DragAndDropObserver(element, {
+            onDragStart: e => {
+                const { id, type } = draggedItemProvider();
+                this.writeDragData(id, type);
+                e.dataTransfer?.setDragImage(element, 0, 0);
+                this.onDragStart.fire({ eventData: e, dragAndDropData: this.readDragData(type) });
+            },
             onDragEnd: e => {
                 const { type } = draggedItemProvider();
                 const data = this.readDragData(type);
@@ -473,4 +476,50 @@ let ResourceListDnDHandler = class ResourceListDnDHandler {
 ResourceListDnDHandler = ( __decorate([
     ( __param(1, IInstantiationService))
 ], ResourceListDnDHandler));
-export { CompositeDragAndDropData, CompositeDragAndDropObserver, DraggedCompositeIdentifier, DraggedEditorGroupIdentifier, DraggedEditorIdentifier, DraggedViewIdentifier, ResourceListDnDHandler, ResourcesDropHandler, extractTreeDropData, fillEditorsDragData, toggleDropEffect };
+class GlobalWindowDraggedOverTracker extends Disposable {
+    static { this.CHANNEL_NAME = 'monaco-workbench-global-dragged-over'; }
+    constructor() {
+        super();
+        this.broadcaster = this._register(( new BroadcastDataChannel(GlobalWindowDraggedOverTracker.CHANNEL_NAME)));
+        this.draggedOver = false;
+        this.registerListeners();
+    }
+    registerListeners() {
+        this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
+            disposables.add(addDisposableListener(window, EventType.DRAG_OVER, () => this.markDraggedOver(false), true));
+            disposables.add(addDisposableListener(window, EventType.DRAG_LEAVE, () => this.clearDraggedOver(false), true));
+        }, { window: mainWindow, disposables: this._store }));
+        this._register(this.broadcaster.onDidReceiveData(data => {
+            if (data === true) {
+                this.markDraggedOver(true);
+            }
+            else {
+                this.clearDraggedOver(true);
+            }
+        }));
+    }
+    get isDraggedOver() { return this.draggedOver; }
+    markDraggedOver(fromBroadcast) {
+        if (this.draggedOver === true) {
+            return;
+        }
+        this.draggedOver = true;
+        if (!fromBroadcast) {
+            this.broadcaster.postData(true);
+        }
+    }
+    clearDraggedOver(fromBroadcast) {
+        if (this.draggedOver === false) {
+            return;
+        }
+        this.draggedOver = false;
+        if (!fromBroadcast) {
+            this.broadcaster.postData(false);
+        }
+    }
+}
+const globalDraggedOverTracker = ( new GlobalWindowDraggedOverTracker());
+function isWindowDraggedOver() {
+    return globalDraggedOverTracker.isDraggedOver;
+}
+export { CompositeDragAndDropData, CompositeDragAndDropObserver, DraggedCompositeIdentifier, DraggedEditorGroupIdentifier, DraggedEditorIdentifier, DraggedViewIdentifier, ResourceListDnDHandler, ResourcesDropHandler, extractTreeDropData, fillEditorsDragData, isWindowDraggedOver, toggleDropEffect };

package/vscode/src/vs/workbench/browser/labels.js

@@ -270,7 +270,7 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
         if (!options?.hidePath) {
             description = this.labelService.getUriLabel(dirname(resource), { relative: true });
         }
-        this.setResource({ resource, name, description }, options);
+        this.setResource({ resource, name, description, range: options?.range }, options);
     }
     setResource(label, options = Object.create(null)) {
         const resource = toResource(label);
@@ -369,7 +369,6 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
             labelEscapeNewLines: this.options?.labelEscapeNewLines
         };
         const resource = toResource(this.label);
-        const label = this.label.name;
         if (this.options?.title !== undefined) {
             iconLabelOptions.title = this.options.title;
         }
@@ -422,7 +421,12 @@ let ResourceLabelWidget = class ResourceLabelWidget extends IconLabel {
                 }
             }
         }
-        this.setLabel(label || '', this.label.description, iconLabelOptions);
+        if (this.label.range) {
+            iconLabelOptions.suffix = this.label.range.startLineNumber !== this.label.range.endLineNumber ?
+                `:${this.label.range.startLineNumber}-${this.label.range.endLineNumber}` :
+                `:${this.label.range.startLineNumber}`;
+        }
+        this.setLabel(this.label.name ?? '', this.label.description, iconLabelOptions);
         this._onDidRender.fire();
         return true;
     }

package/vscode/src/vs/workbench/browser/media/part.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .part{box-sizing:border-box;overflow:hidden}.monaco-workbench .part>.drop-block-overlay.visible{visibility:visible}.monaco-workbench .part>.drop-block-overlay{height:100%;opacity:0;position:absolute;top:0;visibility:hidden;width:100%;z-index:12}.monaco-workbench .part>.title{box-sizing:border-box;display:none;display:flex;height:35px;overflow:hidden;padding-left:8px;padding-right:8px}.monaco-workbench .part>.title>.title-label{line-height:35px;overflow:hidden;padding-left:12px;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part>.title>.title-label h2{cursor:default;font-size:11px;font-weight:400;margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part>.title>.title-label a{cursor:default;font-size:13px;text-decoration:none}.monaco-workbench .part>.title>.title-actions{flex:1;height:35px;padding-left:5px}.monaco-workbench .part>.title>.title-actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block}.monaco-workbench .part>.title>.title-actions .action-label .label{display:none}.monaco-workbench .part>.content{font-size:13px}.monaco-workbench .part.editor>.content .monaco-progress-container,.monaco-workbench .part>.content>.monaco-progress-container{height:2px;left:0;position:absolute;top:33px;z-index:5}.monaco-workbench\n\t.part.editor>.content\n\t.monaco-progress-container\n\t.progress-bit,.monaco-workbench .part>.content>.monaco-progress-container .progress-bit{height:2px}";
+var css = ".monaco-workbench .part{box-sizing:border-box;overflow:hidden}.monaco-workbench .part>.drop-block-overlay.visible{visibility:visible}.monaco-workbench .part>.drop-block-overlay{height:100%;opacity:0;position:absolute;top:0;visibility:hidden;width:100%;z-index:12}.monaco-workbench .part>.title{box-sizing:border-box;display:none;display:flex;height:35px;overflow:hidden;padding-left:8px;padding-right:8px}.monaco-workbench .part>.title>.title-label{line-height:35px;overflow:hidden;padding-left:12px;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part>.title>.title-label h2{cursor:default;font-size:11px;font-weight:400;margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .part>.title>.title-label a{cursor:default;font-size:13px;text-decoration:none}.monaco-workbench .part>.title>.title-actions{flex:1;height:35px;padding-left:5px}.monaco-workbench .part>.title>.title-actions .action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block}.monaco-workbench .part>.title>.title-actions .action-label .label{display:none}.monaco-workbench .part>.content{font-size:13px}.monaco-workbench .part.editor>.content .editor-group-container>.monaco-progress-container,.monaco-workbench .part>.content>.monaco-progress-container{left:0;position:absolute;top:33px;z-index:5}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/browser/panecomposite.d.ts

@@ -1,5 +1,5 @@
-import { Composite, CompositeDescriptor } from './composite.js';
-import { IInstantiationService, BrandedService } from '../../platform/instantiation/common/instantiation.js';
+import { CompositeDescriptor, Composite } from './composite.js';
+import { BrandedService, IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
 import { URI } from '../../base/common/uri.js';
 import { Dimension } from '../../base/browser/dom.js';
 import { IActionViewItem } from '../../base/browser/ui/actionbar/actionbar.js';

package/vscode/src/vs/workbench/browser/panecomposite.js

@@ -22,6 +22,7 @@ let PaneComposite = class PaneComposite extends Composite {
         this.contextService = contextService;
     }
     create(parent) {
+        super.create(parent);
         this.viewPaneContainer = this._register(this.createViewPaneContainer(parent));
         this._register(this.viewPaneContainer.onTitleAreaUpdate(() => this.updateTitleArea()));
         this.viewPaneContainer.create(parent);
@@ -112,6 +113,7 @@ let PaneComposite = class PaneComposite extends Composite {
         return this.viewPaneContainer?.getTitle() ?? '';
     }
     focus() {
+        super.focus();
         this.viewPaneContainer?.focus();
     }
 };

package/vscode/src/vs/workbench/browser/part.js

@@ -1,8 +1,9 @@
 import './media/part.css.js';
 import { Component } from '../common/component.js';
-import { size, Dimension } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { size, Dimension, getActiveDocument } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 class Part extends Component {
     get dimension() { return this._dimension; }
     constructor(id, options, themeService, storageService, layoutService) {
@@ -81,4 +82,34 @@ class PartLayout {
         return { titleSize, contentSize };
     }
 }
-export { Part };
+class MultiWindowParts extends Disposable {
+    constructor() {
+        super(...arguments);
+        this._parts = ( new Set());
+    }
+    get parts() { return Array.from(this._parts); }
+    registerPart(part) {
+        this._parts.add(part);
+        return this._register(toDisposable(() => this.unregisterPart(part)));
+    }
+    unregisterPart(part) {
+        this._parts.delete(part);
+    }
+    getPart(container) {
+        return this.getPartByDocument(container.ownerDocument);
+    }
+    getPartByDocument(document) {
+        if (this._parts.size > 1) {
+            for (const part of this._parts) {
+                if (part.element?.ownerDocument === document) {
+                    return part;
+                }
+            }
+        }
+        return this.mainPart;
+    }
+    get activePart() {
+        return this.getPartByDocument(getActiveDocument());
+    }
+}
+export { MultiWindowParts, Part };