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

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

@@ -14,6 +14,7 @@ import { hasCustomTitlebar } from 'vscode/vscode/vs/platform/window/common/windo
 import { EditorPart } from './editorPart.js';
 import { WindowTitle } from 'vscode/vscode/vs/workbench/browser/parts/titlebar/windowTitle';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
+import { GroupsOrder, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { shouldShowCustomTitleBar } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -88,10 +89,10 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
         const useCustomTitle = isNative && hasCustomTitlebar();
         if (useCustomTitle) {
             titlebarPart = disposables.add(this.titleService.createAuxiliaryTitlebarPart(auxiliaryWindow.container, editorPart));
-            titlebarVisible = shouldShowCustomTitleBar(this.configurationService, auxiliaryWindow.window);
+            titlebarVisible = shouldShowCustomTitleBar(this.configurationService, auxiliaryWindow.window, undefined, false);
             const handleTitleBarVisibilityEvent = () => {
                 const oldTitlebarPartVisible = titlebarVisible;
-                titlebarVisible = shouldShowCustomTitleBar(this.configurationService, auxiliaryWindow.window);
+                titlebarVisible = shouldShowCustomTitleBar(this.configurationService, auxiliaryWindow.window, undefined, false);
                 if (oldTitlebarPartVisible !== titlebarVisible) {
                     updateTitlebarVisibility(true);
                 }
@@ -148,10 +149,10 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
             statusbarPart.layout(dimension.width, statusbarPart.height, dimension.height - statusbarPart.height, 0);
         }));
         auxiliaryWindow.layout();
-        const instantiationService = this.instantiationService.createChild(( new ServiceCollection(
+        const instantiationService = disposables.add(this.instantiationService.createChild(( new ServiceCollection(
             [IStatusbarService, this.statusbarService.createScoped(statusbarPart, disposables)],
             [IEditorService, this.editorService.createScoped(editorPart, disposables)]
-        )));
+        ))));
         return {
             part: editorPart,
             instantiationService,
@@ -190,7 +191,7 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
     }
     doRemoveLastGroup(preserveFocus) {
         const restoreFocus = !preserveFocus && this.shouldRestoreFocus(this.container);
-        const mostRecentlyActiveGroups = this.editorPartsView.getGroups(1 );
+        const mostRecentlyActiveGroups = this.editorPartsView.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
         const nextActiveGroup = mostRecentlyActiveGroups[1];
         if (nextActiveGroup) {
             nextActiveGroup.groupsView.activateGroup(nextActiveGroup);
@@ -222,14 +223,14 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
             return true;
         }
         let targetGroup = undefined;
-        for (const group of this.editorPartsView.mainPart.getGroups(1 )) {
+        for (const group of this.editorPartsView.mainPart.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
             if (!group.isLocked) {
                 targetGroup = group;
                 break;
             }
         }
         if (!targetGroup) {
-            targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? 3  : 1 );
+            targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? GroupDirection.RIGHT : GroupDirection.DOWN);
         }
         const result = this.mergeAllGroups(targetGroup);
         targetGroup.focus();