@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarModel.js

@@ -1,4 +1,4 @@
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { isStatusbarEntryLocation } from '../../../services/statusbar/browser/statusbar.js';
 import { isAncestor, hide, show } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
@@ -30,30 +30,28 @@ class StatusbarViewModel extends Disposable {
         }
     }
     registerListeners() {
-        this._register(this.storageService.onDidChangeValue(e => this.onDidStorageValueChange(e)));
-    }
-    onDidStorageValueChange(event) {
-        if (event.key === StatusbarViewModel.HIDDEN_ENTRIES_KEY && event.scope === 0 ) {
-            const currentlyHidden = ( new Set(this.hidden));
-            this.hidden.clear();
-            this.restoreState();
-            const changed = ( new Set());
-            for (const id of currentlyHidden) {
-                if (!( this.hidden.has(id))) {
-                    changed.add(id);
-                }
+        this._register(this.storageService.onDidChangeValue(0 , StatusbarViewModel.HIDDEN_ENTRIES_KEY, this._register(( new DisposableStore())))(() => this.onDidStorageValueChange()));
+    }
+    onDidStorageValueChange() {
+        const currentlyHidden = ( new Set(this.hidden));
+        this.hidden.clear();
+        this.restoreState();
+        const changed = ( new Set());
+        for (const id of currentlyHidden) {
+            if (!( this.hidden.has(id))) {
+                changed.add(id);
             }
-            for (const id of this.hidden) {
-                if (!( currentlyHidden.has(id))) {
-                    changed.add(id);
-                }
+        }
+        for (const id of this.hidden) {
+            if (!( currentlyHidden.has(id))) {
+                changed.add(id);
             }
-            if (changed.size > 0) {
-                for (const entry of this._entries) {
-                    if (( changed.has(entry.id))) {
-                        this.updateVisibility(entry.id, true);
-                        changed.delete(entry.id);
-                    }
+        }
+        if (changed.size > 0) {
+            for (const entry of this._entries) {
+                if (( changed.has(entry.id))) {
+                    this.updateVisibility(entry.id, true);
+                    changed.delete(entry.id);
                 }
             }
         }

package/vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js

@@ -15,7 +15,7 @@ import { contrastBorder, activeContrastBorder } from 'monaco-editor/esm/vs/platf
 import { addDisposableListener, EventType, clearNode, EventHelper, createStyleSheet } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
-import { coalesce, equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
+import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
 import { ToggleStatusbarVisibilityAction } from '../../actions/layoutActions.js';
 import { assertIsDefined } from 'monaco-editor/esm/vs/base/common/types.js';
@@ -116,7 +116,7 @@ let StatusbarPart = class StatusbarPart extends Part {
         return accessor;
     }
     doAddEntry(entry, id, alignment, priority) {
-        const itemContainer = this.doCreateStatusItem(id, alignment, ...coalesce([entry.showBeak ? 'has-beak' : undefined]));
+        const itemContainer = this.doCreateStatusItem(id, alignment);
         const item = this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, entry, this.hoverDelegate);
         const viewModelEntry = new class {
             constructor() {

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -320,7 +320,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                         id: `workbench.actions.menubar.focus`,
                         title: { value: ( localize('focusMenu', "Focus Application Menu")), original: 'Focus Application Menu' },
                         keybinding: {
-                            primary: 68 ,
+                            primary: 512  | 68 ,
                             weight: 200 ,
                             when: IsWebContext
                         },

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -62,6 +62,7 @@ import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/tel
 import { ITreeViewsDnDService } from 'monaco-editor/esm/vs/editor/common/services/treeViewsDndService.js';
 import { DraggedTreeItemsIdentifier } from 'monaco-editor/esm/vs/editor/common/services/treeViewsDnd.js';
 import { MarkdownRenderer } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
+var TreeRenderer_1;
 let TreeViewPane = class TreeViewPane extends ViewPane {
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService) {
         super({ ...options, titleMenuId: MenuId.ViewTitle, donotForwardArgs: false }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
@@ -501,7 +502,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             }
             this.tree.domFocus();
         }
-        else if (this.tree) {
+        else if (this.tree && this.treeContainer && !this.treeContainer.classList.contains('hide')) {
             this.tree.domFocus();
         }
         else {
@@ -867,6 +868,9 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
         }
         else if (this.treeContainer) {
             this.treeContainer.classList.remove('hide');
+            if (this.domNode === dom.getActiveElement()) {
+                this.focus();
+            }
             this.domNode.removeAttribute('tabindex');
         }
     }
@@ -926,6 +930,7 @@ class TreeDataSource {
     }
 }
 let TreeRenderer = class TreeRenderer extends Disposable {
+    static { TreeRenderer_1 = this; }
     static { this.ITEM_HEIGHT = 22; }
     static { this.TREE_TEMPLATE_ID = 'treeExplorer'; }
     constructor(treeViewId, menus, labels, actionViewItemProvider, aligner, checkboxStateHandler, manuallyManageCheckboxes, themeService, configurationService, labelService, hoverService, treeViewsService, contextKeyService) {
@@ -958,7 +963,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         }));
     }
     get templateId() {
-        return TreeRenderer.TREE_TEMPLATE_ID;
+        return TreeRenderer_1.TREE_TEMPLATE_ID;
     }
     set actionRunner(actionRunner) {
         this._actionRunner = actionRunner;
@@ -1047,7 +1052,8 @@ let TreeRenderer = class TreeRenderer extends Disposable {
                 matches: matches ? matches : createMatches(element.filterData),
                 strikethrough: treeItemLabel?.strikethrough,
                 disabledCommand: !commandEnabled,
-                labelEscapeNewLines: true
+                labelEscapeNewLines: true,
+                forceLabel: !!node.label
             });
         }
         else {
@@ -1237,7 +1243,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         templateData.elementDisposable.dispose();
     }
 };
-TreeRenderer = ( __decorate([
+TreeRenderer = TreeRenderer_1 = ( __decorate([
     ( __param(7, IThemeService)),
     ( __param(8, IConfigurationService)),
     ( __param(9, ILabelService)),

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.d.ts

@@ -49,4 +49,4 @@ declare class FilterWidget extends Widget {
     private onInputKeyDown;
 }
 
-export { FilterWidget, IFilterWidgetOptions };
+export { FilterWidget, type IFilterWidgetOptions };

package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts

@@ -113,4 +113,4 @@ declare abstract class ViewPane extends Pane implements IView {
     shouldShowFilterInHeader(): boolean;
 }
 
-export { IViewPaneOptions, ViewPane, ViewPaneShowActions };
+export { type IViewPaneOptions, ViewPane, ViewPaneShowActions };

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -38,6 +38,7 @@ import { FilterWidget } from './viewFilter.js';
 import { BaseActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
 import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+var ViewPane_1;
 var ViewPaneShowActions;
 ( (function(ViewPaneShowActions) {
     ViewPaneShowActions[ViewPaneShowActions["Default"] = 0] = "Default";
@@ -112,6 +113,7 @@ ViewWelcomeController = ( __decorate([
     ( __param(1, IContextKeyService))
 ], ViewWelcomeController));
 let ViewPane = class ViewPane extends Pane {
+    static { ViewPane_1 = this; }
     static { this.AlwaysShowActionsConfig = 'workbench.view.alwaysShowHeaderActions'; }
     get title() {
         return this._title;
@@ -219,7 +221,7 @@ let ViewPane = class ViewPane extends Pane {
         else {
             console.error(`View container model not found for view ${this.id}`);
         }
-        const onDidRelevantConfigurationChange = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ViewPane.AlwaysShowActionsConfig));
+        const onDidRelevantConfigurationChange = Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(ViewPane_1.AlwaysShowActionsConfig));
         this._register(onDidRelevantConfigurationChange(this.updateActionsVisibility, this));
         this.updateActionsVisibility();
     }
@@ -501,7 +503,7 @@ let ViewPane = class ViewPane extends Pane {
         return false;
     }
 };
-ViewPane = ( __decorate([
+ViewPane = ViewPane_1 = ( __decorate([
     ( __param(1, IKeybindingService)),
     ( __param(2, IContextMenuService)),
     ( __param(3, IConfigurationService)),

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.d.ts

@@ -110,4 +110,4 @@ declare class ViewPaneContainer extends Component implements IViewPaneContainer
     dispose(): void;
 }
 
-export { IViewPaneContainerOptions, ViewPaneContainer };
+export { type IViewPaneContainerOptions, ViewPaneContainer };

package/vscode/src/vs/workbench/browser/parts/views/viewsService.js

@@ -33,6 +33,8 @@ let ViewsService = class ViewsService extends Disposable {
         this.onDidChangeViewVisibility = this._onDidChangeViewVisibility.event;
         this._onDidChangeViewContainerVisibility = this._register(( new Emitter()));
         this.onDidChangeViewContainerVisibility = this._onDidChangeViewContainerVisibility.event;
+        this._onDidChangeFocusedView = this._register(( new Emitter()));
+        this.onDidChangeFocusedView = this._onDidChangeFocusedView.event;
         this.viewDisposable = ( new Map());
         this.visibleViewContextKeys = ( new Map());
         this.viewPaneContainers = ( new Map());
@@ -184,6 +186,10 @@ let ViewsService = class ViewsService extends Disposable {
         }
         return null;
     }
+    getFocusedViewName() {
+        const viewId = this.contextKeyService.getContextKeyValue(FocusedViewContext.key) ?? '';
+        return this.viewDescriptorService.getViewDescriptorById(( viewId.toString()))?.name ?? '';
+    }
     async openView(id, focus) {
         const viewContainer = this.viewDescriptorService.getViewContainerByViewId(id);
         if (!viewContainer) {
@@ -522,10 +528,16 @@ let ViewsService = class ViewsService extends Disposable {
         disposables.add(viewPaneContainer.onDidAddViews(views => this.onViewsAdded(views)));
         disposables.add(viewPaneContainer.onDidChangeViewVisibility(view => this.onViewsVisibilityChanged(view, view.isBodyVisible())));
         disposables.add(viewPaneContainer.onDidRemoveViews(views => this.onViewsRemoved(views)));
-        disposables.add(viewPaneContainer.onDidFocusView(view => this.focusedViewContextKey.set(view.id)));
+        disposables.add(viewPaneContainer.onDidFocusView(view => {
+            if (this.focusedViewContextKey.get() !== view.id) {
+                this.focusedViewContextKey.set(view.id);
+                this._onDidChangeFocusedView.fire();
+            }
+        }));
         disposables.add(viewPaneContainer.onDidBlurView(view => {
             if (this.focusedViewContextKey.get() === view.id) {
                 this.focusedViewContextKey.reset();
+                this._onDidChangeFocusedView.fire();
             }
         }));
         return viewPaneContainer;

package/vscode/src/vs/workbench/browser/parts/views/viewsViewlet.d.ts

@@ -5,4 +5,4 @@ interface IViewletViewOptions extends IViewPaneOptions {
     readonly fromExtensionId?: ExtensionIdentifier;
 }
 
-export { IViewletViewOptions };
+export type { IViewletViewOptions };

package/vscode/src/vs/workbench/browser/web.api.d.ts

@@ -558,4 +558,4 @@ interface IRemoteResourceRequest {
     respondWith(statusCode: number, body: Uint8Array, headers: Record<string, string>): void;
 }
 
-export { ColorScheme, ExtensionId, ICommand, ICommonTelemetryPropertiesResolver, IDefaultEditor, IDefaultLayout, IDefaultView, IDevelopmentOptions, IExternalUriResolver, IHomeIndicator, IInitialColorTheme, IProductQualityChangeHandler, IRemoteResourceProvider, IRemoteResourceRequest, IResourceUriProvider, ISettingsSyncOptions, IShowPortCandidate, ITunnel, ITunnelFactory, ITunnelOptions, ITunnelProvider, IWelcomeBanner, IWelcomeDialog, IWelcomeLinkAction, IWindowIndicator, IWorkbenchConstructionOptions, MarketplaceExtension, Menu, TunnelCreationOptions };
+export { ColorScheme, type ExtensionId, type ICommand, type ICommonTelemetryPropertiesResolver, type IDefaultEditor, type IDefaultLayout, type IDefaultView, type IDevelopmentOptions, type IExternalUriResolver, type IHomeIndicator, type IInitialColorTheme, type IProductQualityChangeHandler, type IRemoteResourceProvider, type IRemoteResourceRequest, type IResourceUriProvider, type ISettingsSyncOptions, type IShowPortCandidate, type ITunnel, type ITunnelFactory, type ITunnelOptions, type ITunnelProvider, type IWelcomeBanner, type IWelcomeDialog, type IWelcomeLinkAction, type IWindowIndicator, type IWorkbenchConstructionOptions, type MarketplaceExtension, Menu, type TunnelCreationOptions };

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

@@ -256,6 +256,33 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     "Controls the size of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is disabled."
                 ))
             },
+            'workbench.editor.preventPinnedEditorClose': {
+                'type': 'string',
+                'enum': ['keyboardAndMouse', 'keyboard', 'mouse', 'never'],
+                'default': 'keyboardAndMouse',
+                'enumDescriptions': [
+                    ( localize(
+                        'workbench.editor.preventPinnedEditorClose.always',
+                        "Always prevent closing the pinned editor when using mouse middle click or keyboard."
+                    )),
+                    ( localize(
+                        'workbench.editor.preventPinnedEditorClose.onlyKeyboard',
+                        "Prevent closing the pinned editor when using the keyboard."
+                    )),
+                    ( localize(
+                        'workbench.editor.preventPinnedEditorClose.onlyMouse',
+                        "Prevent closing the pinned editor when using mouse middle click."
+                    )),
+                    ( localize(
+                        'workbench.editor.preventPinnedEditorClose.never',
+                        "Never prevent closing a pinned editor."
+                    ))
+                ],
+                description: ( localize(
+                    'workbench.editor.preventPinnedEditorClose',
+                    "Controls whether pinned editors should close when keyboard or middle mouse click is used for closing."
+                )),
+            },
             'workbench.editor.splitSizing': {
                 'type': 'string',
                 'enum': ['auto', 'distribute', 'split'],
@@ -291,7 +318,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 'type': 'boolean',
                 'description': ( localize(
                     'focusRecentEditorAfterClose',
-                    "Controls whether tabs are closed in most recently used order or from left to right."
+                    "Controls whether editors are closed in most recently used order or from left to right."
                 )),
                 'default': true
             },
@@ -571,12 +598,12 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 )),
                 'default': false
             },
-            'workbench.commandPalette.experimental.useSemanticSimilarity': {
+            'workbench.commandPalette.experimental.enableNaturalLanguageSearch': {
                 'type': 'boolean',
                 tags: ['experimental'],
                 'description': ( localize(
-                    'useSemanticSimilarity',
-                    "Controls whether the command palette should include similar commands. You must have an extension installed that provides Semantic Similarity."
+                    'enableNaturalLanguageSearch',
+                    "Controls whether the command palette should include similar commands. You must have an extension installed that provides Natural Language support."
                 )),
                 'default': true
             },
@@ -817,7 +844,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
     });
     let windowTitleDescription = ( localize(
         'windowTitle',
-        "Controls the window title based on the active editor. Variables are substituted based on the context:"
+        "Controls the window title based on the current context such as the opened workspace or active editor. Variables are substituted based on the context:"
     ));
     windowTitleDescription += '\n- ' + [
         ( localize(
@@ -874,6 +901,10 @@ const registry = ( Registry.as(Extensions$1.Configuration));
             'dirty',
             "`${dirty}`: an indicator for when the active editor has unsaved changes."
         )),
+        ( localize(
+            'focusedView',
+            "`${focusedView}`: the name of the view that is currently focused."
+        )),
         ( localize(
             'separator',
             "`${separator}`: a conditional separator (\" - \") that only shows when surrounded by variables with values or static text."
@@ -906,8 +937,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
             },
             'window.commandCenter': {
                 type: 'boolean',
-                default: false,
-                tags: ['experimental'],
+                default: true,
                 markdownDescription: isWeb ?
                     ( localize(
                         'window.commandCenterWeb',

package/vscode/src/vs/workbench/common/composite.d.ts

@@ -36,4 +36,4 @@ interface IComposite {
 interface ICompositeControl {
 }
 
-export { IComposite, ICompositeControl };
+export type { IComposite, ICompositeControl };

package/vscode/src/vs/workbench/common/contextkeys.js

@@ -8,6 +8,7 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from './editor.js';
+var ResourceContextKey_1;
 const WorkbenchStateContext = ( new RawContextKey('workbenchState', undefined, { type: 'string', description: ( localize(
     'workbenchState',
     "The kind of workspace opened in the window, either 'empty' (no workspace), 'folder' (single folder) or 'workspace' (multi-root workspace)"
@@ -86,6 +87,7 @@ const FocusedViewContext = ( new RawContextKey('focusedView', '', ( localize('fo
 function getVisbileViewContextKey(viewId) { return `view.${viewId}.visible`; }
 function getEnabledViewContainerContextKey(viewContainerId) { return `viewContainer.${viewContainerId}.enabled`; }
 let ResourceContextKey = class ResourceContextKey {
+    static { ResourceContextKey_1 = this; }
     static { this.Scheme = ( new RawContextKey('resourceScheme', undefined, { type: 'string', description: ( localize('resourceScheme', "The scheme of the resource")) })); }
     static { this.Filename = ( new RawContextKey(
         'resourceFilename',
@@ -120,15 +122,15 @@ let ResourceContextKey = class ResourceContextKey {
         this._languageService = _languageService;
         this._modelService = _modelService;
         this._disposables = ( new DisposableStore());
-        this._schemeKey = ResourceContextKey.Scheme.bindTo(this._contextKeyService);
-        this._filenameKey = ResourceContextKey.Filename.bindTo(this._contextKeyService);
-        this._dirnameKey = ResourceContextKey.Dirname.bindTo(this._contextKeyService);
-        this._pathKey = ResourceContextKey.Path.bindTo(this._contextKeyService);
-        this._langIdKey = ResourceContextKey.LangId.bindTo(this._contextKeyService);
-        this._resourceKey = ResourceContextKey.Resource.bindTo(this._contextKeyService);
-        this._extensionKey = ResourceContextKey.Extension.bindTo(this._contextKeyService);
-        this._hasResource = ResourceContextKey.HasResource.bindTo(this._contextKeyService);
-        this._isFileSystemResource = ResourceContextKey.IsFileSystemResource.bindTo(this._contextKeyService);
+        this._schemeKey = ResourceContextKey_1.Scheme.bindTo(this._contextKeyService);
+        this._filenameKey = ResourceContextKey_1.Filename.bindTo(this._contextKeyService);
+        this._dirnameKey = ResourceContextKey_1.Dirname.bindTo(this._contextKeyService);
+        this._pathKey = ResourceContextKey_1.Path.bindTo(this._contextKeyService);
+        this._langIdKey = ResourceContextKey_1.LangId.bindTo(this._contextKeyService);
+        this._resourceKey = ResourceContextKey_1.Resource.bindTo(this._contextKeyService);
+        this._extensionKey = ResourceContextKey_1.Extension.bindTo(this._contextKeyService);
+        this._hasResource = ResourceContextKey_1.HasResource.bindTo(this._contextKeyService);
+        this._isFileSystemResource = ResourceContextKey_1.IsFileSystemResource.bindTo(this._contextKeyService);
         this._disposables.add(_fileService.onDidChangeFileSystemProviderRegistrations(() => {
             const resource = this.get();
             this._isFileSystemResource.set(Boolean(resource && _fileService.hasProvider(resource)));
@@ -198,7 +200,7 @@ let ResourceContextKey = class ResourceContextKey {
         return this._value;
     }
 };
-ResourceContextKey = ( __decorate([
+ResourceContextKey = ResourceContextKey_1 = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, IFileService)),
     ( __param(2, ILanguageService)),

package/vscode/src/vs/workbench/common/contributions.d.ts

@@ -4,4 +4,4 @@
 interface IWorkbenchContribution {
 }
 
-export { IWorkbenchContribution };
+export type { IWorkbenchContribution };

package/vscode/src/vs/workbench/common/editor/diffEditorInput.js

@@ -5,13 +5,14 @@ import { BINARY_DIFF_EDITOR_ID, TEXT_DIFF_EDITOR_ID, isResourceDiffEditorInput }
 import { BaseTextEditorModel } from './textEditorModel.js';
 import { DiffEditorModel } from './diffEditorModel.js';
 import { TextDiffEditorModel } from './textDiffEditorModel.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 import { shorten } from 'monaco-editor/esm/vs/base/common/labels.js';
+var DiffEditorInput_1;
 let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
+    static { DiffEditorInput_1 = this; }
     static { this.ID = 'workbench.editors.diffEditorInput'; }
     get typeId() {
-        return DiffEditorInput.ID;
+        return DiffEditorInput_1.ID;
     }
     get editorId() {
         return this.modified.editorId === this.original.editorId ? this.modified.editorId : undefined;
@@ -122,10 +123,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
         if (modifiedEditorModel instanceof BaseTextEditorModel && originalEditorModel instanceof BaseTextEditorModel) {
             return ( new TextDiffEditorModel(originalEditorModel, modifiedEditorModel));
         }
-        return ( new DiffEditorModel(
-            withNullAsUndefined(originalEditorModel),
-            withNullAsUndefined(modifiedEditorModel)
-        ));
+        return ( new DiffEditorModel(originalEditorModel ?? undefined, modifiedEditorModel ?? undefined));
     }
     toUntyped(options) {
         const untyped = super.toUntyped(options);
@@ -142,7 +140,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
         if (this === otherInput) {
             return true;
         }
-        if (otherInput instanceof DiffEditorInput) {
+        if (otherInput instanceof DiffEditorInput_1) {
             return this.modified.matches(otherInput.modified) && this.original.matches(otherInput.original) && otherInput.forceOpenAsBinary === this.forceOpenAsBinary;
         }
         if (isResourceDiffEditorInput(otherInput)) {
@@ -158,7 +156,7 @@ let DiffEditorInput = class DiffEditorInput extends SideBySideEditorInput {
         super.dispose();
     }
 };
-DiffEditorInput = ( __decorate([
+DiffEditorInput = DiffEditorInput_1 = ( __decorate([
     ( __param(5, IEditorService))
 ], DiffEditorInput));
 export { DiffEditorInput };

package/vscode/src/vs/workbench/common/editor/editorGroupModel.d.ts

@@ -19,4 +19,4 @@ interface IGroupModelChangeEvent {
     readonly editorIndex?: number;
 }
 
-export { IGroupModelChangeEvent };
+export type { IGroupModelChangeEvent };

package/vscode/src/vs/workbench/common/editor/editorGroupModel.js

@@ -8,6 +8,7 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
 import { Disposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
+var EditorGroupModel_1;
 const EditorOpenPositioning = {
     LEFT: 'left',
     RIGHT: 'right',
@@ -31,6 +32,7 @@ function isGroupEditorCloseEvent(e) {
     return candidate.kind === 4  && candidate.editorIndex !== undefined && candidate.context !== undefined && candidate.sticky !== undefined;
 }
 let EditorGroupModel = class EditorGroupModel extends Disposable {
+    static { EditorGroupModel_1 = this; }
     static { this.IDS = 0; }
     get id() { return this._id; }
     constructor(labelOrSerializedGroup, instantiationService, configurationService) {
@@ -41,6 +43,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.onDidModelChange = this._onDidModelChange.event;
         this.editors = [];
         this.mru = [];
+        this.editorListeners = ( new Set());
         this.locked = false;
         this.preview = null;
         this.active = null;
@@ -49,7 +52,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
             this._id = this.deserialize(labelOrSerializedGroup);
         }
         else {
-            this._id = EditorGroupModel.IDS++;
+            this._id = EditorGroupModel_1.IDS++;
         }
         this.onConfigurationUpdated();
         this.registerListeners();
@@ -185,6 +188,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
     }
     registerEditorListeners(editor) {
         const listeners = ( new DisposableStore());
+        this.editorListeners.add(listeners);
         listeners.add(Event.once(editor.onWillDispose)(() => {
             const editorIndex = this.editors.indexOf(editor);
             if (editorIndex >= 0) {
@@ -223,6 +227,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         listeners.add(this.onDidModelChange(event => {
             if (event.kind === 4  && event.editor?.matches(editor)) {
                 dispose(listeners);
+                this.editorListeners.delete(listeners);
             }
         }));
     }
@@ -579,7 +584,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }
     }
     clone() {
-        const clone = this.instantiationService.createInstance(EditorGroupModel, undefined);
+        const clone = this.instantiationService.createInstance(EditorGroupModel_1, undefined);
         clone.editors = this.editors.slice(0);
         clone.mru = this.mru.slice(0);
         clone.preview = this.preview;
@@ -632,10 +637,10 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         const registry = ( Registry.as(EditorExtensions.EditorFactory));
         if (typeof data.id === 'number') {
             this._id = data.id;
-            EditorGroupModel.IDS = Math.max(data.id + 1, EditorGroupModel.IDS);
+            EditorGroupModel_1.IDS = Math.max(data.id + 1, EditorGroupModel_1.IDS);
         }
         else {
-            this._id = EditorGroupModel.IDS++;
+            this._id = EditorGroupModel_1.IDS++;
         }
         if (data.locked) {
             this.locked = true;
@@ -665,8 +670,13 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }
         return this._id;
     }
+    dispose() {
+        dispose(Array.from(this.editorListeners));
+        this.editorListeners.clear();
+        super.dispose();
+    }
 };
-EditorGroupModel = ( __decorate([
+EditorGroupModel = EditorGroupModel_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IConfigurationService))
 ], EditorGroupModel));

package/vscode/src/vs/workbench/common/editor/editorInput.d.ts

@@ -215,4 +215,4 @@ declare abstract class EditorInput extends AbstractEditorInput {
     dispose(): void;
 }
 
-export { EditorInput, IEditorCloseHandler };
+export { EditorInput, type IEditorCloseHandler };

package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js

@@ -4,10 +4,12 @@ import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { isResourceDiffEditorInput, isResourceSideBySideEditorInput, isResourceMergeEditorInput, isEditorInput, findViewStateForEditor, isResourceEditorInput, isDiffEditorInput } from '../editor.js';
 import { EditorInput } from './editorInput.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
+var SideBySideEditorInput_1;
 let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
+    static { SideBySideEditorInput_1 = this; }
     static { this.ID = 'workbench.editorinputs.sidebysideEditorInput'; }
     get typeId() {
-        return SideBySideEditorInput.ID;
+        return SideBySideEditorInput_1.ID;
     }
     get capabilities() {
         let capabilities = this.primary.capabilities;
@@ -124,7 +126,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
             return this;
         }
         if (primarySaveResult instanceof EditorInput) {
-            return ( new SideBySideEditorInput(
+            return ( new SideBySideEditorInput_1(
                 this.preferredName,
                 this.preferredDescription,
                 primarySaveResult,
@@ -155,7 +157,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         }
         if (isEditorInput(renameResult.editor)) {
             return {
-                editor: ( new SideBySideEditorInput(
+                editor: ( new SideBySideEditorInput_1(
                     this.preferredName,
                     this.preferredDescription,
                     renameResult.editor,
@@ -216,7 +218,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         if (isDiffEditorInput(otherInput) || isResourceDiffEditorInput(otherInput)) {
             return false;
         }
-        if (otherInput instanceof SideBySideEditorInput) {
+        if (otherInput instanceof SideBySideEditorInput_1) {
             return this.primary.matches(otherInput.primary) && this.secondary.matches(otherInput.secondary);
         }
         if (isResourceSideBySideEditorInput(otherInput)) {
@@ -225,7 +227,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         return false;
     }
 };
-SideBySideEditorInput = ( __decorate([
+SideBySideEditorInput = SideBySideEditorInput_1 = ( __decorate([
     ( __param(4, IEditorService))
 ], SideBySideEditorInput));
 export { SideBySideEditorInput };