@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/editorplaceholder.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { truncate, truncateMiddle } from '../../../../base/common/strings.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { isEditorOpenError } from '../../../common/editor.js';
 import { EditorPane } from './editorPane.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
@@ -27,8 +27,8 @@ var EditorPlaceholder_1, WorkspaceTrustRequiredPlaceholderEditor_1, ErrorPlaceho
 let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
     static { EditorPlaceholder_1 = this; }
     static { this.PLACEHOLDER_LABEL_MAX_LENGTH = 1024; }
-    constructor(id, telemetryService, themeService, storageService) {
-        super(id, telemetryService, themeService, storageService);
+    constructor(id, group, telemetryService, themeService, storageService) {
+        super(id, group, telemetryService, themeService, storageService);
         this.inputDisposable = this._register(( new MutableDisposable()));
     }
     createEditor(parent) {
@@ -56,7 +56,7 @@ let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
         const { icon, label, actions } = await this.getContents(input, options, disposables);
         const truncatedLabel = truncate(label, EditorPlaceholder_1.PLACEHOLDER_LABEL_MAX_LENGTH);
         const iconContainer = container.appendChild($('.editor-placeholder-icon-container'));
-        const iconWidget = ( new SimpleIconLabel(iconContainer));
+        const iconWidget = disposables.add(( new SimpleIconLabel(iconContainer)));
         iconWidget.text = icon;
         const labelContainer = container.appendChild($('.editor-placeholder-label-container'));
         const labelWidget = document.createElement('span');
@@ -106,9 +106,9 @@ let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
     }
 };
 EditorPlaceholder = EditorPlaceholder_1 = ( __decorate([
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService))
+    ( __param(2, ITelemetryService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IStorageService))
 ], EditorPlaceholder));
 let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceholderEditor extends EditorPlaceholder {
     static { WorkspaceTrustRequiredPlaceholderEditor_1 = this; }
@@ -119,8 +119,8 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         "Workspace Trust Required"
     )); }
     static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor_1, WorkspaceTrustRequiredPlaceholderEditor_1.ID, WorkspaceTrustRequiredPlaceholderEditor_1.LABEL); }
-    constructor(telemetryService, themeService, commandService, workspaceService, storageService) {
-        super(WorkspaceTrustRequiredPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, themeService, commandService, workspaceService, storageService) {
+        super(WorkspaceTrustRequiredPlaceholderEditor_1.ID, group, telemetryService, themeService, storageService);
         this.commandService = commandService;
         this.workspaceService = workspaceService;
     }
@@ -155,11 +155,11 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
     }
 };
 WorkspaceTrustRequiredPlaceholderEditor = WorkspaceTrustRequiredPlaceholderEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, ICommandService)),
-    ( __param(3, IWorkspaceContextService)),
-    ( __param(4, IStorageService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, ICommandService)),
+    ( __param(4, IWorkspaceContextService)),
+    ( __param(5, IStorageService))
 ], WorkspaceTrustRequiredPlaceholderEditor));
 let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlaceholder {
     static { ErrorPlaceholderEditor_1 = this; }
@@ -170,14 +170,13 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         "Error Editor"
     )); }
     static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor_1, ErrorPlaceholderEditor_1.ID, ErrorPlaceholderEditor_1.LABEL); }
-    constructor(telemetryService, themeService, storageService, fileService, dialogService) {
-        super(ErrorPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, themeService, storageService, fileService, dialogService) {
+        super(ErrorPlaceholderEditor_1.ID, group, telemetryService, themeService, storageService);
         this.fileService = fileService;
         this.dialogService = dialogService;
     }
     async getContents(input, options, disposables) {
         const resource = input.resource;
-        const group = this.group;
         const error = options.error;
         const isFileNotFound = error?.fileOperationResult === 1 ;
         let label;
@@ -208,10 +207,10 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         }
         let icon = '$(error)';
         if (isEditorOpenError(error)) {
-            if (error.forceSeverity === Severity.Info) {
+            if (error.forceSeverity === Severity$1.Info) {
                 icon = '$(info)';
             }
-            else if (error.forceSeverity === Severity.Warning) {
+            else if (error.forceSeverity === Severity$1.Warning) {
                 icon = '$(warning)';
             }
         }
@@ -229,7 +228,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
                 };
             }));
         }
-        else if (group) {
+        else {
             actions = [
                 {
                     label: ( localizeWithPath(
@@ -237,14 +236,14 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
                         'retry',
                         "Try Again"
                     )),
-                    run: () => group.openEditor(input, { ...options, source: EditorOpenSource.USER  })
+                    run: () => this.group.openEditor(input, { ...options, source: EditorOpenSource.USER  })
                 }
             ];
         }
-        if (group && isFileNotFound && resource && this.fileService.hasProvider(resource)) {
+        if (isFileNotFound && resource && this.fileService.hasProvider(resource)) {
             disposables.add(this.fileService.onDidFilesChange(e => {
                 if (e.contains(resource, 1 , 0 )) {
-                    group.openEditor(input, options);
+                    this.group.openEditor(input, options);
                 }
             }));
         }
@@ -252,10 +251,10 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
     }
 };
 ErrorPlaceholderEditor = ErrorPlaceholderEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IFileService)),
-    ( __param(4, IDialogService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IFileService)),
+    ( __param(5, IDialogService))
 ], ErrorPlaceholderEditor));
 export { EditorPlaceholder, ErrorPlaceholderEditor, WorkspaceTrustRequiredPlaceholderEditor };

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

@@ -3,7 +3,7 @@ import './media/editorstatus.css.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { runAtThisOrScheduleAtNextAnimationFrame, getWindowById } from '../../../../base/browser/dom.js';
 import { format, splitLines, compare } from '../../../../base/common/strings.js';
-import { isEqual, extname, basename } from '../../../../base/common/resources.js';
+import { extname, basename, isEqual } from '../../../../base/common/resources.js';
 import { areFunctions, assertIsDefined } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Action } from '../../../../base/common/actions.js';
@@ -213,7 +213,6 @@ let TabFocusMode = class TabFocusMode extends Disposable {
         this.registerListeners();
         const tabFocusModeConfig = configurationService.getValue('editor.tabFocusMode') === true ? true : false;
         TabFocus.setTabFocusMode(tabFocusModeConfig);
-        this._onDidChange.fire(tabFocusModeConfig);
     }
     registerListeners() {
         this._register(TabFocus.onDidChangeTabFocus(tabFocusMode => this._onDidChange.fire(tabFocusMode)));
@@ -278,12 +277,12 @@ let EditorStatus = class EditorStatus extends Disposable {
         this.eolElement = this._register(( new MutableDisposable()));
         this.languageElement = this._register(( new MutableDisposable()));
         this.metadataElement = this._register(( new MutableDisposable()));
-        this.currentProblemStatus = this._register(this.instantiationService.createInstance(ShowCurrentMarkerInStatusbarContribution));
+        this.currentMarkerStatus = this._register(this.instantiationService.createInstance(ShowCurrentMarkerInStatusbarContribution));
+        this.tabFocusMode = this._register(this.instantiationService.createInstance(TabFocusMode));
         this.state = ( new State());
+        this.toRender = undefined;
         this.activeEditorListeners = this._register(( new DisposableStore()));
         this.delayedRender = this._register(( new MutableDisposable()));
-        this.tabFocusMode = this.instantiationService.createInstance(TabFocusMode);
-        this.toRender = undefined;
         this.registerCommands();
         this.registerListeners();
     }
@@ -301,7 +300,7 @@ let EditorStatus = class EditorStatus extends Disposable {
         }));
     }
     registerCommands() {
-        CommandsRegistry.registerCommand({ id: `changeEditorIndentation${this.targetWindowId}`, handler: () => this.showIndentationPicker() });
+        this._register(CommandsRegistry.registerCommand({ id: `changeEditorIndentation${this.targetWindowId}`, handler: () => this.showIndentationPicker() }));
     }
     async showIndentationPicker() {
         const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
@@ -623,7 +622,7 @@ let EditorStatus = class EditorStatus extends Disposable {
         this.onEncodingChange(activeEditorPane, activeCodeEditor);
         this.onIndentationChange(activeCodeEditor);
         this.onMetadataChange(activeEditorPane);
-        this.currentProblemStatus.update(activeCodeEditor);
+        this.currentMarkerStatus.update(activeCodeEditor);
         this.activeEditorListeners.clear();
         if (activeEditorPane) {
             this.activeEditorListeners.add(activeEditorPane.onDidChangeControl(() => {
@@ -638,14 +637,14 @@ let EditorStatus = class EditorStatus extends Disposable {
             }));
             this.activeEditorListeners.add(Event.defer(activeCodeEditor.onDidChangeCursorPosition)(() => {
                 this.onSelectionChange(activeCodeEditor);
-                this.currentProblemStatus.update(activeCodeEditor);
+                this.currentMarkerStatus.update(activeCodeEditor);
             }));
             this.activeEditorListeners.add(activeCodeEditor.onDidChangeModelLanguage(() => {
                 this.onLanguageChange(activeCodeEditor, activeInput);
             }));
             this.activeEditorListeners.add(Event.accumulate(activeCodeEditor.onDidChangeModelContent)(e => {
                 this.onEOLChange(activeCodeEditor);
-                this.currentProblemStatus.update(activeCodeEditor);
+                this.currentMarkerStatus.update(activeCodeEditor);
                 const selections = activeCodeEditor.getSelections();
                 if (selections) {
                     for (const inner of e) {
@@ -947,29 +946,29 @@ let ShowCurrentMarkerInStatusbarContribution = class ShowCurrentMarkerInStatusba
                 resource: model.uri,
                 severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
             });
-            this.markers.sort(compareMarker);
+            this.markers.sort(this.compareMarker);
         }
         else {
             this.markers = [];
         }
         this.updateStatus();
     }
+    compareMarker(a, b) {
+        let res = compare(( a.resource.toString()), ( b.resource.toString()));
+        if (res === 0) {
+            res = MarkerSeverity.compare(a.severity, b.severity);
+        }
+        if (res === 0) {
+            res = Range.compareRangesUsingStarts(a, b);
+        }
+        return res;
+    }
 };
 ShowCurrentMarkerInStatusbarContribution = ( __decorate([
     ( __param(0, IStatusbarService)),
     ( __param(1, IMarkerService)),
     ( __param(2, IConfigurationService))
 ], ShowCurrentMarkerInStatusbarContribution));
-function compareMarker(a, b) {
-    let res = compare(( a.resource.toString()), ( b.resource.toString()));
-    if (res === 0) {
-        res = MarkerSeverity.compare(a.severity, b.severity);
-    }
-    if (res === 0) {
-        res = Range.compareRangesUsingStarts(a, b);
-    }
-    return res;
-}
 let ShowLanguageExtensionsAction = class ShowLanguageExtensionsAction extends Action {
     static { ShowLanguageExtensionsAction_1 = this; }
     static { this.ID = 'workbench.action.showLanguageExtensions'; }

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

@@ -15,7 +15,17 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { listActiveSelectionForeground, listActiveSelectionBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import { listActiveSelectionForeground, listActiveSelectionBackground } from '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { DraggedEditorGroupIdentifier, isWindowDraggedOver, fillEditorsDragData } from '../../dnd.js';
 import { EditorPane } from './editorPane.js';
@@ -32,7 +42,7 @@ import { EDITOR_CORE_NAVIGATION_COMMANDS } from './editorCommands.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var EditorTabsControl_1;
 class EditorCommandsContextActionRunner extends ActionRunner {
     constructor(context) {

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

@@ -11,8 +11,8 @@ import { IEditorGroupsService } from '../../../services/editor/common/editorGrou
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { MutableDisposable } from '../../../../base/common/lifecycle.js';
 let AbstractEditorWithViewState = class AbstractEditorWithViewState extends EditorPane {
-    constructor(id, viewStateStorageKey, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService) {
-        super(id, telemetryService, themeService, storageService);
+    constructor(id, group, viewStateStorageKey, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService) {
+        super(id, group, telemetryService, themeService, storageService);
         this.instantiationService = instantiationService;
         this.textResourceConfigurationService = textResourceConfigurationService;
         this.editorService = editorService;
@@ -20,9 +20,9 @@ let AbstractEditorWithViewState = class AbstractEditorWithViewState extends Edit
         this.groupListener = this._register(( new MutableDisposable()));
         this.viewState = this.getEditorMemento(editorGroupService, textResourceConfigurationService, viewStateStorageKey, 100);
     }
-    setEditorVisible(visible, group) {
-        this.groupListener.value = group?.onWillCloseEditor(e => this.onWillCloseEditor(e));
-        super.setEditorVisible(visible, group);
+    setEditorVisible(visible) {
+        this.groupListener.value = this.group.onWillCloseEditor(e => this.onWillCloseEditor(e));
+        super.setEditorVisible(visible);
     }
     onWillCloseEditor(e) {
         const editor = e.editor;
@@ -58,7 +58,7 @@ let AbstractEditorWithViewState = class AbstractEditorWithViewState extends Edit
             }
         }
         if ((input.isDisposed() && !this.tracksDisposedEditorViewState()) ||
-            (!this.shouldRestoreEditorViewState(input) && (!this.group || !this.group.contains(input)))) {
+            (!this.shouldRestoreEditorViewState(input) && !this.group.contains(input))) {
             this.clearEditorViewState(resource, this.group);
         }
         else if (!input.isDisposed()) {
@@ -83,9 +83,6 @@ let AbstractEditorWithViewState = class AbstractEditorWithViewState extends Edit
         return this.computeEditorViewState(resource);
     }
     saveEditorViewState(resource) {
-        if (!this.group) {
-            return;
-        }
         const editorViewState = this.computeEditorViewState(resource);
         if (!editorViewState) {
             return;
@@ -93,7 +90,7 @@ let AbstractEditorWithViewState = class AbstractEditorWithViewState extends Edit
         this.viewState.saveEditorState(this.group, resource, editorViewState);
     }
     loadEditorViewState(input, context) {
-        if (!input || !this.group) {
+        if (!input) {
             return undefined;
         }
         if (!this.tracksEditorViewState(input)) {
@@ -128,12 +125,12 @@ let AbstractEditorWithViewState = class AbstractEditorWithViewState extends Edit
     }
 };
 AbstractEditorWithViewState = ( __decorate([
-    ( __param(2, ITelemetryService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, ITextResourceConfigurationService)),
-    ( __param(6, IThemeService)),
-    ( __param(7, IEditorService)),
-    ( __param(8, IEditorGroupsService))
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, ITextResourceConfigurationService)),
+    ( __param(7, IThemeService)),
+    ( __param(8, IEditorService)),
+    ( __param(9, IEditorGroupsService))
 ], AbstractEditorWithViewState));
 export { AbstractEditorWithViewState };

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

@@ -20,7 +20,17 @@ import { ScrollableElement } from '../../../../base/browser/ui/scrollbar/scrolla
 import { getOrSet } from '../../../../base/common/map.js';
 import { registerThemingParticipant, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { EDITOR_GROUP_HEADER_TABS_BORDER, TAB_BORDER, TAB_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_ACTIVE_BORDER, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_INACTIVE_BACKGROUND, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_INACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_LAST_PINNED_BORDER, TAB_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_DRAG_AND_DROP_BACKGROUND, WORKBENCH_BACKGROUND } from '../../../common/theme.js';
-import { contrastBorder, activeContrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { DraggedEditorIdentifier, DraggedEditorGroupIdentifier, isWindowDraggedOver, extractTreeDropData, ResourcesDropHandler } from '../../dnd.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { Dimension, addDisposableListener, EventType as EventType$1, DragAndDropObserver, clearNode, scheduleAtNextAnimationFrame, getWindow, isMouseEvent, findParentWithClass, EventHelper } from '../../../../base/browser/dom.js';

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

@@ -16,17 +16,17 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         const unstickyModel = this._register(( new UnstickyEditorGroupModel(this.model)));
         this.stickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, stickyModel));
         this.unstickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, unstickyModel));
-        this.handlePinnedTabsSeparateRowToolbars();
+        this.handlePinnedTabsLayoutChange();
     }
-    handlePinnedTabsSeparateRowToolbars() {
+    handlePinnedTabsLayoutChange() {
         if (this.groupView.count === 0) {
             return;
         }
-        if (this.groupView.count === this.groupView.stickyCount) {
-            this.parent.classList.toggle('two-tab-bars', false);
-        }
-        else {
-            this.parent.classList.toggle('two-tab-bars', true);
+        const hadTwoTabBars = this.parent.classList.contains('two-tab-bars');
+        const hasTwoTabBars = this.groupView.count !== this.groupView.stickyCount && this.groupView.stickyCount > 0;
+        this.parent.classList.toggle('two-tab-bars', hasTwoTabBars);
+        if (hadTwoTabBars !== hasTwoTabBars) {
+            this.groupView.relayout();
         }
     }
     getEditorTabsController(editor) {
@@ -53,7 +53,7 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         return didChange;
     }
     handleOpenedEditors() {
-        this.handlePinnedTabsSeparateRowToolbars();
+        this.handlePinnedTabsLayoutChange();
     }
     beforeCloseEditor(editor) {
         this.getEditorTabsController(editor).beforeCloseEditor(editor);
@@ -71,7 +71,7 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         this.handleClosedEditors();
     }
     handleClosedEditors() {
-        this.handlePinnedTabsSeparateRowToolbars();
+        this.handlePinnedTabsLayoutChange();
     }
     moveEditor(editor, fromIndex, targetIndex, stickyStateChange) {
         if (stickyStateChange) {
@@ -83,7 +83,7 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
                 this.stickyEditorTabsControl.closeEditor(editor);
                 this.unstickyEditorTabsControl.openEditor(editor);
             }
-            this.handlePinnedTabsSeparateRowToolbars();
+            this.handlePinnedTabsLayoutChange();
         }
         else {
             if (this.model.isSticky(editor)) {
@@ -100,12 +100,12 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
     stickEditor(editor) {
         this.unstickyEditorTabsControl.closeEditor(editor);
         this.stickyEditorTabsControl.openEditor(editor);
-        this.handlePinnedTabsSeparateRowToolbars();
+        this.handlePinnedTabsLayoutChange();
     }
     unstickEditor(editor) {
         this.stickyEditorTabsControl.closeEditor(editor);
         this.unstickyEditorTabsControl.openEditor(editor);
-        this.handlePinnedTabsSeparateRowToolbars();
+        this.handlePinnedTabsLayoutChange();
     }
     setActive(isActive) {
         this.stickyEditorTabsControl.setActive(isActive);

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

@@ -48,8 +48,8 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     get maximumWidth() { return this.maximumPrimaryWidth + this.maximumSecondaryWidth; }
     get minimumHeight() { return this.minimumPrimaryHeight + this.minimumSecondaryHeight; }
     get maximumHeight() { return this.maximumPrimaryHeight + this.maximumSecondaryHeight; }
-    constructor(telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
-        super(SideBySideEditor_1.ID, SideBySideEditor_1.VIEW_STATE_PREFERENCE_KEY, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
+    constructor(group, telemetryService, instantiationService, themeService, storageService, configurationService, textResourceConfigurationService, editorService, editorGroupService) {
+        super(SideBySideEditor_1.ID, group, SideBySideEditor_1.VIEW_STATE_PREFERENCE_KEY, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
         this.configurationService = configurationService;
         this.onDidCreateEditors = this._register(( new Emitter()));
         this._onDidChangeSizeConstraints = this._register(( new Relay()));
@@ -211,9 +211,9 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (!editorPaneDescriptor) {
             throw new Error('No editor pane descriptor for editor found');
         }
-        const editorPane = editorPaneDescriptor.instantiate(this.instantiationService);
+        const editorPane = editorPaneDescriptor.instantiate(this.instantiationService, this.group);
         editorPane.create(container);
-        editorPane.setVisible(this.isVisible(), this.group);
+        editorPane.setVisible(this.isVisible());
         if (isEditorPaneWithSelection(editorPane)) {
             this.editorDisposables.add(editorPane.onDidChangeSelection(e => this._onDidChangeSelection.fire(e)));
         }
@@ -244,10 +244,10 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         }
         this.getLastFocusedEditorPane()?.setOptions(options);
     }
-    setEditorVisible(visible, group) {
-        this.primaryEditorPane?.setVisible(visible, group);
-        this.secondaryEditorPane?.setVisible(visible, group);
-        super.setEditorVisible(visible, group);
+    setEditorVisible(visible) {
+        this.primaryEditorPane?.setVisible(visible);
+        this.secondaryEditorPane?.setVisible(visible);
+        super.setEditorVisible(visible);
     }
     clearInput() {
         super.clearInput();
@@ -354,14 +354,14 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
     }
 };
 SideBySideEditor = SideBySideEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, IConfigurationService)),
-    ( __param(5, ITextResourceConfigurationService)),
-    ( __param(6, IEditorService)),
-    ( __param(7, IEditorGroupsService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IThemeService)),
+    ( __param(4, IStorageService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, ITextResourceConfigurationService)),
+    ( __param(7, IEditorService)),
+    ( __param(8, IEditorGroupsService))
 ], SideBySideEditor));
 class SideBySideAwareEditorPaneSelection {
     constructor(selection, side) {

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

@@ -3,7 +3,7 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { isEqual } from '../../../../base/common/resources.js';
-import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
 import { AbstractTextEditor } from './textEditor.js';
 class AbstractTextCodeEditor extends AbstractTextEditor {
@@ -69,8 +69,8 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
     hasFocus() {
         return this.editorControl?.hasTextFocus() || super.hasFocus();
     }
-    setEditorVisible(visible, group) {
-        super.setEditorVisible(visible, group);
+    setEditorVisible(visible) {
+        super.setEditorVisible(visible);
         if (visible) {
             this.editorControl?.onVisible();
         }

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

@@ -37,8 +37,8 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         const modifiedEditor = this.diffEditorControl.getModifiedEditor();
         return (originalEditor.hasTextFocus() ? originalEditor : modifiedEditor).invokeWithinContext(accessor => accessor.get(IContextKeyService));
     }
-    constructor(telemetryService, instantiationService, storageService, configurationService, editorService, themeService, editorGroupService, fileService, preferencesService) {
-        super(TextDiffEditor_1.ID, telemetryService, instantiationService, storageService, configurationService, themeService, editorService, editorGroupService, fileService);
+    constructor(group, telemetryService, instantiationService, storageService, configurationService, editorService, themeService, editorGroupService, fileService, preferencesService) {
+        super(TextDiffEditor_1.ID, group, telemetryService, instantiationService, storageService, configurationService, themeService, editorService, editorGroupService, fileService);
         this.preferencesService = preferencesService;
         this.diffEditorControl = undefined;
         this.inputLifecycleStopWatch = undefined;
@@ -111,7 +111,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.isFileBinaryError(error)) {
             return this.openAsBinary(input, options);
         }
-        if (error.fileOperationResult === 7  && this.group) {
+        if (error.fileOperationResult === 7 ) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localizeWithPath(
@@ -157,14 +157,14 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (fileEditorFactory.isFileEditor(modified)) {
             modified.setForceOpenAsBinary();
         }
-        (this.group ?? this.editorGroupService.activeGroup).replaceEditors([{
+        this.group.replaceEditors([{
                 editor: input,
                 replacement: binaryDiffInput,
                 options: {
                     ...options,
                     activation: EditorActivation.PRESERVE,
-                    pinned: this.group?.isPinned(input),
-                    sticky: this.group?.isSticky(input)
+                    pinned: this.group.isPinned(input),
+                    sticky: this.group.isSticky(input)
                 }
             }]);
     }
@@ -254,8 +254,8 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
     hasFocus() {
         return this.diffEditorControl?.hasTextFocus() || super.hasFocus();
     }
-    setEditorVisible(visible, group) {
-        super.setEditorVisible(visible, group);
+    setEditorVisible(visible) {
+        super.setEditorVisible(visible);
         if (visible) {
             this.diffEditorControl?.onVisible();
         }
@@ -307,14 +307,14 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
     }
 };
 TextDiffEditor = TextDiffEditor_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, ITextResourceConfigurationService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IThemeService)),
-    ( __param(6, IEditorGroupsService)),
-    ( __param(7, IFileService)),
-    ( __param(8, IPreferencesService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, ITextResourceConfigurationService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, IThemeService)),
+    ( __param(7, IEditorGroupsService)),
+    ( __param(8, IFileService)),
+    ( __param(9, IPreferencesService))
 ], TextDiffEditor));
 export { TextDiffEditor };