@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
 import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -139,7 +139,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     type: 'number',
                     default: getLargeFileConfirmationLimit(this.environmentService.remoteAuthority) / ByteSize.MB,
                     minimum: 1,
-                    scope: 4 ,
+                    scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localizeWithPath(
                         _moduleId,
                         7,

package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js

@@ -29,7 +29,9 @@ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/co
 import { LocalSelectionTransfer, Extensions, containsDragType, CodeDataTransfers } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
 import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, extractTreeDropData, ResourcesDropHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { fillActiveEditorViewState } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
+import { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND, EDITOR_DROP_INTO_PROMPT_BACKGROUND, EDITOR_DROP_INTO_PROMPT_FOREGROUND, EDITOR_DROP_INTO_PROMPT_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
+import { MergeGroupMode, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITreeViewsDnDService } from 'vscode/vscode/vs/editor/common/services/treeViewsDndService';
@@ -130,7 +132,7 @@ let DropOverlay = class DropOverlay extends Themable {
                 }
                 else if (isDraggingEditor) {
                     const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
-                    if (Array.isArray(data)) {
+                    if (Array.isArray(data) && data.length > 0) {
                         isCopy = this.isCopyOperation(e, data[0].identifier);
                     }
                 }
@@ -169,18 +171,18 @@ let DropOverlay = class DropOverlay extends Themable {
         }));
     }
     isDropIntoActiveEditorEnabled() {
-        return !!this.groupView.activeEditor?.hasCapability(128 );
+        return !!this.groupView.activeEditor?.hasCapability(EditorInputCapabilities.CanDropIntoEditor);
     }
     findSourceGroupView() {
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 return this.editorGroupService.getGroup(data[0].identifier);
             }
         }
         else if (this.editorTransfer.hasData(DraggedEditorIdentifier.prototype)) {
             const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 return this.editorGroupService.getGroup(data[0].identifier.groupId);
             }
         }
@@ -199,7 +201,7 @@ let DropOverlay = class DropOverlay extends Themable {
         };
         if (this.groupTransfer.hasData(DraggedEditorGroupIdentifier.prototype)) {
             const data = this.groupTransfer.getData(DraggedEditorGroupIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 const sourceGroup = this.editorGroupService.getGroup(data[0].identifier);
                 if (sourceGroup) {
                     if (typeof splitDirection !== 'number' && sourceGroup === this.groupView) {
@@ -217,7 +219,7 @@ let DropOverlay = class DropOverlay extends Themable {
                     else {
                         let mergeGroupOptions = undefined;
                         if (this.isCopyOperation(event)) {
-                            mergeGroupOptions = { mode: 0  };
+                            mergeGroupOptions = { mode: MergeGroupMode.COPY_EDITORS };
                         }
                         this.editorGroupService.mergeGroup(sourceGroup, this.groupView, mergeGroupOptions);
                     }
@@ -230,11 +232,12 @@ let DropOverlay = class DropOverlay extends Themable {
         }
         else if (this.editorTransfer.hasData(DraggedEditorIdentifier.prototype)) {
             const data = this.editorTransfer.getData(DraggedEditorIdentifier.prototype);
-            if (Array.isArray(data)) {
-                const draggedEditor = data[0].identifier;
-                const sourceGroup = this.editorGroupService.getGroup(draggedEditor.groupId);
+            if (Array.isArray(data) && data.length > 0) {
+                const draggedEditors = data;
+                const firstDraggedEditor = data[0].identifier;
+                const sourceGroup = this.editorGroupService.getGroup(firstDraggedEditor.groupId);
                 if (sourceGroup) {
-                    const copyEditor = this.isCopyOperation(event, draggedEditor);
+                    const copyEditor = this.isCopyOperation(event, firstDraggedEditor);
                     let targetGroup = undefined;
                     if (this.editorGroupService.partOptions.closeEmptyGroups && sourceGroup.count === 1 && typeof splitDirection === 'number' && !copyEditor) {
                         targetGroup = this.editorGroupService.moveGroup(sourceGroup, this.groupView, splitDirection);
@@ -244,15 +247,18 @@ let DropOverlay = class DropOverlay extends Themable {
                         if (sourceGroup === targetGroup) {
                             return;
                         }
-                        const options = fillActiveEditorViewState(sourceGroup, draggedEditor.editor, {
-                            pinned: true,
-                            sticky: sourceGroup.isSticky(draggedEditor.editor),
-                        });
+                        const editors = ( (draggedEditors.map(draggedEditor => ({
+                            editor: draggedEditor.identifier.editor,
+                            options: fillActiveEditorViewState(sourceGroup, draggedEditor.identifier.editor, {
+                                pinned: true,
+                                sticky: sourceGroup.isSticky(draggedEditor.identifier.editor)
+                            })
+                        }))));
                         if (!copyEditor) {
-                            sourceGroup.moveEditor(draggedEditor.editor, targetGroup, options);
+                            sourceGroup.moveEditors(editors, targetGroup);
                         }
                         else {
-                            sourceGroup.copyEditor(draggedEditor.editor, targetGroup, options);
+                            sourceGroup.copyEditors(editors, targetGroup);
                         }
                     }
                     targetGroup.focus();
@@ -262,7 +268,7 @@ let DropOverlay = class DropOverlay extends Themable {
         }
         else if (this.treeItemsTransfer.hasData(DraggedTreeItemsIdentifier.prototype)) {
             const data = this.treeItemsTransfer.getData(DraggedTreeItemsIdentifier.prototype);
-            if (Array.isArray(data)) {
+            if (Array.isArray(data) && data.length > 0) {
                 const editors = [];
                 for (const id of data) {
                     const dataTransferItem = await this.treeViewsDragAndDropService.removeDragOperationTransfer(id.identifier);
@@ -283,7 +289,7 @@ let DropOverlay = class DropOverlay extends Themable {
         }
     }
     isCopyOperation(e, draggedEditor) {
-        if (draggedEditor?.editor.hasCapability(8 )) {
+        if (draggedEditor?.editor.hasCapability(EditorInputCapabilities.Singleton)) {
             return false;
         }
         return (e.ctrlKey && !isMacintosh) || (e.altKey && isMacintosh);
@@ -327,47 +333,47 @@ let DropOverlay = class DropOverlay extends Themable {
         else {
             if (preferSplitVertically) {
                 if (mousePosX < splitWidthThreshold) {
-                    splitDirection = 2 ;
+                    splitDirection = GroupDirection.LEFT;
                 }
                 else if (mousePosX > splitWidthThreshold * 2) {
-                    splitDirection = 3 ;
+                    splitDirection = GroupDirection.RIGHT;
                 }
                 else if (mousePosY < editorControlHeight / 2) {
-                    splitDirection = 0 ;
+                    splitDirection = GroupDirection.UP;
                 }
                 else {
-                    splitDirection = 1 ;
+                    splitDirection = GroupDirection.DOWN;
                 }
             }
             else {
                 if (mousePosY < splitHeightThreshold) {
-                    splitDirection = 0 ;
+                    splitDirection = GroupDirection.UP;
                 }
                 else if (mousePosY > splitHeightThreshold * 2) {
-                    splitDirection = 1 ;
+                    splitDirection = GroupDirection.DOWN;
                 }
                 else if (mousePosX < editorControlWidth / 2) {
-                    splitDirection = 2 ;
+                    splitDirection = GroupDirection.LEFT;
                 }
                 else {
-                    splitDirection = 3 ;
+                    splitDirection = GroupDirection.RIGHT;
                 }
             }
         }
         switch (splitDirection) {
-            case 0 :
+            case GroupDirection.UP:
                 this.doPositionOverlay({ top: '0', left: '0', width: '100%', height: '50%' });
                 this.toggleDropIntoPrompt(false);
                 break;
-            case 1 :
+            case GroupDirection.DOWN:
                 this.doPositionOverlay({ top: '50%', left: '0', width: '100%', height: '50%' });
                 this.toggleDropIntoPrompt(false);
                 break;
-            case 2 :
+            case GroupDirection.LEFT:
                 this.doPositionOverlay({ top: '0', left: '0', width: '50%', height: '100%' });
                 this.toggleDropIntoPrompt(false);
                 break;
-            case 3 :
+            case GroupDirection.RIGHT:
                 this.doPositionOverlay({ top: '0', left: '50%', width: '50%', height: '100%' });
                 this.toggleDropIntoPrompt(false);
                 break;