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

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

@@ -21,10 +21,9 @@ import { getQuickNavigateHandler, inQuickPickContext } from '../../quickaccess.j
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { registerEditorContribution } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
-import { FloatingClickMenu } from '../../codeeditor.js';
+import { FloatingEditorClickMenu } from '../../codeeditor.js';
 import { Extensions } from '../../../common/contributions.js';
 import { EditorAutoSave } from './editorAutoSave.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
@@ -52,7 +51,7 @@ import '../../../../editor/browser/widget/diffEditorWidget2/diffEditorWidget2.co
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(AccessibilityStatus, 2 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(UntitledTextEditorWorkingCopyEditorHandler, 2 );
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DynamicEditorConfigurations, 2 );
-registerEditorContribution(FloatingClickMenu.ID, FloatingClickMenu, 1 );
+registerEditorContribution(FloatingEditorClickMenu.ID, FloatingEditorClickMenu, 1 );
 const quickAccessRegistry = ( Registry.as(Extensions$1.Quickaccess));
 const editorPickerContextKey = 'inEditorsPicker';
 const editorPickerContext = ( ContextKeyExpr.and(inQuickPickContext, ( ContextKeyExpr.has(editorPickerContextKey))));
@@ -349,19 +348,21 @@ appendEditorToolItem({
     title: ( localize('navigate.next.label', "Next Change")),
     icon: nextChangeIcon
 }, TextCompareEditorActiveContext, 11);
-appendEditorToolItem({
-    id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
-    title: ( localize(
-        'ignoreTrimWhitespace.label',
-        "Ignore Leading/Trailing Whitespace Differences"
-    )),
-    icon: toggleWhitespace
-}, ( ContextKeyExpr.and(TextCompareEditorActiveContext, ( ContextKeyExpr.notEquals('config.diffEditor.ignoreTrimWhitespace', true)))), 20);
-appendEditorToolItem({
-    id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
-    title: ( localize('showTrimWhitespace.label', "Show Leading/Trailing Whitespace Differences")),
-    icon: ThemeIcon.modify(toggleWhitespace, 'disabled')
-}, ( ContextKeyExpr.and(TextCompareEditorActiveContext, ( ContextKeyExpr.notEquals('config.diffEditor.ignoreTrimWhitespace', false)))), 20);
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+    command: {
+        id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
+        title: ( localize(
+            'ignoreTrimWhitespace.label',
+            "Show Leading/Trailing Whitespace Differences"
+        )),
+        icon: toggleWhitespace,
+        precondition: TextCompareEditorActiveContext,
+        toggled: ( ContextKeyExpr.equals('config.diffEditor.ignoreTrimWhitespace', false)),
+    },
+    group: 'navigation',
+    when: TextCompareEditorActiveContext,
+    order: 20,
+});
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: KEEP_EDITOR_COMMAND_ID, title: { value: ( localize('keepEditor', "Keep Editor")), original: 'Keep Editor' }, category: Categories.View }, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: PIN_EDITOR_COMMAND_ID, title: { value: ( localize('pinEditor', "Pin Editor")), original: 'Pin Editor' }, category: Categories.View } });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: { value: ( localize('unpinEditor', "Unpin Editor")), original: 'Unpin Editor' }, category: Categories.View } });

package/vscode/src/vs/workbench/browser/parts/editor/editor.d.ts

@@ -17,4 +17,4 @@ interface EditorServiceImpl extends IEditorService {
     readonly onDidMostRecentlyActiveEditorsChange: Event<void>;
 }
 
-export { EditorServiceImpl };
+export type { EditorServiceImpl };

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

@@ -10,6 +10,7 @@ const DEFAULT_EDITOR_PART_OPTIONS = {
     tabSizingFixedMinWidth: 50,
     tabSizingFixedMaxWidth: 160,
     pinnedTabSizing: 'normal',
+    preventPinnedEditorClose: 'keyboardAndMouse',
     titleScrollbarSizing: 'default',
     focusRecentEditorAfterClose: true,
     showIcons: true,

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

@@ -4,7 +4,6 @@ import { IFilesConfigurationService } from '../../../services/filesConfiguration
 import { IHostService } from '../../../services/host/browser/host.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 let EditorAutoSave = class EditorAutoSave extends Disposable {
@@ -45,7 +44,7 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
             this.maybeTriggerAutoSave(3 , { groupId: this.lastActiveGroupId, editor: this.lastActiveEditor });
         }
         const activeGroup = this.editorGroupService.activeGroup;
-        const activeEditor = this.lastActiveEditor = withNullAsUndefined(activeGroup.activeEditor);
+        const activeEditor = this.lastActiveEditor = activeGroup.activeEditor ?? undefined;
         this.lastActiveGroupId = activeGroup.id;
         this.lastActiveEditorControlDisposable.clear();
         const activeEditorPane = this.editorService.activeEditorPane;

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

@@ -1,5 +1,5 @@
 import { localize } from 'monaco-editor/esm/vs/nls.js';
-import { withNullAsUndefined, isObject, isString, isUndefined, isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
+import { isObject, isString, isUndefined, isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { isEditorInputWithOptionsAndGroup, isEditorIdentifier } from '../../../common/editor.js';
@@ -14,7 +14,7 @@ import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/com
 import { IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { List } from 'monaco-editor/esm/vs/base/browser/ui/list/listWidget.js';
 import { distinct, coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { isEditorGroup, IEditorGroupsService, preferredSideBySideGroupDirection } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorGroupsService, preferredSideBySideGroupDirection, isEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
@@ -324,6 +324,12 @@ function registerDiffEditorCommands() {
         primary: 512  | 63 ,
         handler: accessor => navigateInDiffEditor(accessor, true)
     });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: GOTO_NEXT_CHANGE,
+            title: { value: ( localize('compare.nextChange', "Go to Next Change")), original: 'Go to Next Change' },
+        }
+    });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: GOTO_PREVIOUS_CHANGE,
         weight: 200 ,
@@ -331,6 +337,12 @@ function registerDiffEditorCommands() {
         primary: 512  | 1024  | 63 ,
         handler: accessor => navigateInDiffEditor(accessor, false)
     });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: GOTO_PREVIOUS_CHANGE,
+            title: { value: ( localize('compare.previousChange', "Go to Previous Change")), original: 'Go to Previous Change' },
+        }
+    });
     function getActiveTextDiffEditor(accessor) {
         const editorService = accessor.get(IEditorService);
         for (const editor of [editorService.activeEditorPane, ...editorService.visibleEditorPanes]) {
@@ -514,12 +526,12 @@ function registerOpenEditorAPICommands() {
             options
         }, columnToEditorGroup(editorGroupService, configurationService, column));
     });
-    CommandsRegistry.registerCommand(API_OPEN_WITH_EDITOR_COMMAND_ID, (accessor, resource, id, columnAndOptions) => {
+    CommandsRegistry.registerCommand(API_OPEN_WITH_EDITOR_COMMAND_ID, async (accessor, resource, id, columnAndOptions) => {
         const editorService = accessor.get(IEditorService);
         const editorGroupsService = accessor.get(IEditorGroupsService);
         const configurationService = accessor.get(IConfigurationService);
         const [columnArg, optionsArg] = columnAndOptions ?? [];
-        return editorService.openEditor({ resource: ( URI.from(resource, true)), options: { ...optionsArg, pinned: true, override: id } }, columnToEditorGroup(editorGroupsService, configurationService, columnArg));
+        await editorService.openEditor({ resource: ( URI.from(resource, true)), options: { ...optionsArg, pinned: true, override: id } }, columnToEditorGroup(editorGroupsService, configurationService, columnArg));
     });
 }
 function registerOpenEditorAtIndexCommands() {
@@ -634,7 +646,7 @@ function splitEditor(editorGroupService, direction, context) {
         editorToCopy = sourceGroup.getEditorByIndex(context.editorIndex);
     }
     else {
-        editorToCopy = withNullAsUndefined(sourceGroup.activeEditor);
+        editorToCopy = sourceGroup.activeEditor ?? undefined;
     }
     if (editorToCopy && !editorToCopy.hasCapability(8 )) {
         sourceGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: context?.preserveFocus });
@@ -657,14 +669,17 @@ function registerCloseEditorCommands() {
     function closeEditorHandler(accessor, forceCloseStickyEditors, resourceOrContext, context) {
         const editorGroupsService = accessor.get(IEditorGroupsService);
         const editorService = accessor.get(IEditorService);
-        let keepStickyEditors = true;
+        let keepStickyEditors = undefined;
         if (forceCloseStickyEditors) {
             keepStickyEditors = false;
         }
         else if (resourceOrContext || context) {
             keepStickyEditors = false;
         }
-        if (keepStickyEditors && !resourceOrContext && !context) {
+        else {
+            keepStickyEditors = editorGroupsService.partOptions.preventPinnedEditorClose === 'keyboard' || editorGroupsService.partOptions.preventPinnedEditorClose === 'keyboardAndMouse';
+        }
+        if (keepStickyEditors) {
             const activeGroup = editorGroupsService.activeGroup;
             const activeEditor = activeGroup.activeEditor;
             if (activeEditor && activeGroup.isSticky(activeEditor)) {
@@ -1233,12 +1248,12 @@ function getCommandsContext(resourceOrContext, context) {
 }
 function resolveCommandsContext(editorGroupService, context) {
     let group = context && typeof context.groupId === 'number' ? editorGroupService.getGroup(context.groupId) : undefined;
-    let editor = group && context && typeof context.editorIndex === 'number' ? withNullAsUndefined(group.getEditorByIndex(context.editorIndex)) : undefined;
+    let editor = group && context && typeof context.editorIndex === 'number' ? group.getEditorByIndex(context.editorIndex) ?? undefined : undefined;
     if (!group) {
         group = editorGroupService.activeGroup;
     }
     if (!editor) {
-        editor = withNullAsUndefined(group.activeEditor);
+        editor = group.activeEditor ?? undefined;
     }
     return { group, editor };
 }
@@ -1257,13 +1272,7 @@ function getMultiSelectedEditorContexts(editorContext, listService, editorGroupS
         const focus = editorContext ? editorContext : focusedElements.length ? ( focusedElements.map(elementToContext))[0] : undefined;
         if (focus) {
             const selection = list.getSelectedElements().filter(onlyEditorGroupAndEditor);
-            if (selection?.some(s => {
-                if (isEditorGroup(s)) {
-                    return s.id === focus.groupId;
-                }
-                const group = editorGroupService.getGroup(s.groupId);
-                return s.groupId === focus.groupId && (group ? group.getIndexOfEditor(s.editor) : -1) === focus.editorIndex;
-            })) {
+            if (selection.length > 0) {
                 return ( selection.map(elementToContext));
             }
             return [focus];

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

@@ -10,7 +10,9 @@ import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { getLargeFileConfirmationLimit, ByteSize } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+var DynamicEditorConfigurations_1;
 let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disposable {
+    static { DynamicEditorConfigurations_1 = this; }
     static { this.AUTO_LOCK_DEFAULT_ENABLED = ( new Set(['terminalEditor'])); }
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
@@ -44,19 +46,19 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         Event.debounce(this.editorResolverService.onDidChangeEditorRegistrations, (_, e) => e)(() => this.updateDynamicEditorConfigurations());
     }
     updateDynamicEditorConfigurations() {
-        const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations.AUTO_LOCK_EXTRA_EDITORS].filter(e => !( DynamicEditorConfigurations.AUTO_LOCK_REMOVE_EDITORS.has(e.id)));
+        const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations_1.AUTO_LOCK_EXTRA_EDITORS].filter(e => !( DynamicEditorConfigurations_1.AUTO_LOCK_REMOVE_EDITORS.has(e.id)));
         const binaryEditorCandidates = ( this.editorResolverService.getEditors().filter(e => e.priority !== RegisteredEditorPriority.exclusive).map(e => e.id));
         const autoLockGroupConfiguration = Object.create(null);
         for (const editor of lockableEditors) {
             autoLockGroupConfiguration[editor.id] = {
                 type: 'boolean',
-                default: ( DynamicEditorConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id)),
+                default: ( DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id)),
                 description: editor.label
             };
         }
         const defaultAutoLockGroupConfiguration = Object.create(null);
         for (const editor of lockableEditors) {
-            defaultAutoLockGroupConfiguration[editor.id] = ( DynamicEditorConfigurations.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id));
+            defaultAutoLockGroupConfiguration[editor.id] = ( DynamicEditorConfigurations_1.AUTO_LOCK_DEFAULT_ENABLED.has(editor.id));
         }
         const oldAutoLockConfigurationNode = this.autoLockConfigurationNode;
         this.autoLockConfigurationNode = {
@@ -140,7 +142,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         });
     }
 };
-DynamicEditorConfigurations = ( __decorate([
+DynamicEditorConfigurations = DynamicEditorConfigurations_1 = ( __decorate([
     ( __param(0, IEditorResolverService)),
     ( __param(1, IExtensionService)),
     ( __param(2, IWorkbenchEnvironmentService))

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

@@ -22,6 +22,7 @@ import { IEditorGroupsService } from '../../../services/editor/common/editorGrou
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITreeViewsDnDService } from 'monaco-editor/esm/vs/editor/common/services/treeViewsDndService.js';
 import { DraggedTreeItemsIdentifier } from 'monaco-editor/esm/vs/editor/common/services/treeViewsDnd.js';
+var DropOverlay_1;
 function isDropIntoEditorEnabledGlobally(configurationService) {
     return configurationService.getValue('editor.dropIntoEditor.enabled');
 }
@@ -29,6 +30,7 @@ function isDragIntoEditorEvent(e) {
     return e.shiftKey;
 }
 let DropOverlay = class DropOverlay extends Themable {
+    static { DropOverlay_1 = this; }
     static { this.OVERLAY_ID = 'monaco-workbench-editor-drop-overlay'; }
     get disposed() { return !!this._disposed; }
     constructor(accessor, groupView, themeService, configurationService, instantiationService, editorService, editorGroupService, treeViewsDragAndDropService, contextService) {
@@ -51,7 +53,7 @@ let DropOverlay = class DropOverlay extends Themable {
     create() {
         const overlayOffsetHeight = this.getOverlayOffsetHeight();
         const container = this.container = document.createElement('div');
-        container.id = DropOverlay.OVERLAY_ID;
+        container.id = DropOverlay_1.OVERLAY_ID;
         container.style.top = `${overlayOffsetHeight}px`;
         this.groupView.element.appendChild(container);
         this.groupView.element.classList.add('dragged-over');
@@ -406,7 +408,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this._disposed = true;
     }
 };
-DropOverlay = ( __decorate([
+DropOverlay = DropOverlay_1 = ( __decorate([
     ( __param(2, IThemeService)),
     ( __param(3, IConfigurationService)),
     ( __param(4, IInstantiationService)),

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

@@ -39,7 +39,6 @@ import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { EditorActivation } from 'monaco-editor/esm/vs/platform/editor/common/editor.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
 import { isNative, isWindows, isLinux, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
@@ -47,15 +46,16 @@ import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/tel
 import { defaultProgressBarStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 import { EditorGroupWatermark } from './editorGroupWatermark.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-let EditorGroupView = class EditorGroupView extends Themable {
+var EditorGroupView_1;
+let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
     static createNew(accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView, accessor, null, index);
+        return instantiationService.createInstance(EditorGroupView_1, accessor, null, index);
     }
     static createFromSerialized(serialized, accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView, accessor, serialized, index);
+        return instantiationService.createInstance(EditorGroupView_1, accessor, serialized, index);
     }
     static createCopy(copyFrom, accessor, index, instantiationService) {
-        return instantiationService.createInstance(EditorGroupView, accessor, copyFrom, index);
+        return instantiationService.createInstance(EditorGroupView_1, accessor, copyFrom, index);
     }
     constructor(accessor, from, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService) {
         super(themeService);
@@ -99,7 +99,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
         this.element = document.createElement('div');
         this._onDidChange = this._register(( new Relay()));
         this.onDidChange = this._onDidChange.event;
-        if (from instanceof EditorGroupView) {
+        if (from instanceof EditorGroupView_1) {
             this.model = this._register(from.model.clone());
         }
         else if (isSerializedEditorGroupModel(from)) {
@@ -150,7 +150,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
         const groupActiveEditorStickyContext = ActiveEditorStickyContext.bindTo(this.scopedContextKeyService);
         const groupEditorsCountContext = EditorGroupEditorsCountContext.bindTo(this.scopedContextKeyService);
         const groupLockedContext = ActiveEditorGroupLockedContext.bindTo(this.scopedContextKeyService);
-        const activeEditorListener = ( new MutableDisposable());
+        const activeEditorListener = this._register(( new MutableDisposable()));
         const observeActiveEditor = () => {
             activeEditorListener.clear();
             const activeEditor = this.model.activeEditor;
@@ -322,7 +322,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
             return;
         }
         let options;
-        if (from instanceof EditorGroupView) {
+        if (from instanceof EditorGroupView_1) {
             options = fillActiveEditorViewState(from);
         }
         else {
@@ -395,7 +395,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
     }
     canDispose(editor) {
         for (const groupView of this.accessor.groups) {
-            if (groupView instanceof EditorGroupView && groupView.model.contains(editor, {
+            if (groupView instanceof EditorGroupView_1 && groupView.model.contains(editor, {
                 strictEquals: true,
                 supportSideBySide: SideBySideEditor.ANY
             })) {
@@ -520,7 +520,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
         return this.model.stickyCount;
     }
     get activeEditorPane() {
-        return this.editorPane ? withNullAsUndefined(this.editorPane.activeEditorPane) : undefined;
+        return this.editorPane ? this.editorPane.activeEditorPane ?? undefined : undefined;
     }
     get activeEditor() {
         return this.model.activeEditor;
@@ -740,7 +740,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
             });
         })));
         this.titleAreaControl.openEditors(( inactiveEditors.map(({ editor }) => editor)));
-        return withNullAsUndefined(this.editorPane.activeEditorPane);
+        return this.editorPane.activeEditorPane ?? undefined;
     }
     moveEditors(editors, target) {
         const internalOptions = {
@@ -1216,7 +1216,7 @@ let EditorGroupView = class EditorGroupView extends Themable {
         super.dispose();
     }
 };
-EditorGroupView = ( __decorate([
+EditorGroupView = EditorGroupView_1 = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, IContextKeyService)),
     ( __param(5, IThemeService)),

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

@@ -68,7 +68,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         this.render();
     }
     registerListeners() {
-        this.lifecycleService.onDidShutdown(() => this.dispose());
+        this._register(this.lifecycleService.onDidShutdown(() => this.dispose()));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('workbench.tips.enabled')) {
                 this.render();

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

@@ -25,6 +25,7 @@ import { DeferredPromise, Promises } from 'monaco-editor/esm/vs/base/common/asyn
 import { findGroup } from '../../../services/editor/common/editorGroupFinder.js';
 import { SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { orthogonal } from '../../../../base/browser/ui/grid/gridview.js';
+var EditorPart_1;
 class GridWidgetView {
     constructor() {
         this.element = $('.grid-view-container');
@@ -57,6 +58,7 @@ class GridWidgetView {
     }
 }
 let EditorPart = class EditorPart extends Part {
+    static { EditorPart_1 = this; }
     static { this.EDITOR_PART_UI_STATE_STORAGE_KEY = 'editorpart.state'; }
     static { this.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY = 'editorpart.centeredview'; }
     constructor(instantiationService, themeService, configurationService, storageService, layoutService) {
@@ -151,7 +153,7 @@ let EditorPart = class EditorPart extends Part {
     }
     get isReady() { return this._isReady; }
     get hasRestorableState() {
-        return !!this.workspaceMemento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY];
+        return !!this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
     }
     getGroups(order = 0 ) {
         switch (order) {
@@ -603,7 +605,7 @@ let EditorPart = class EditorPart extends Part {
         this.centeredLayoutWidget = this._register(( new CenteredViewLayout(
             this.container,
             this.gridWidgetView,
-            this.profileMemento[EditorPart.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY]
+            this.profileMemento[EditorPart_1.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY]
         )));
         this._register(this.onDidChangeEditorPartOptions(e => this.centeredLayoutWidget.setFixedWidth(e.newPartOptions.centeredLayoutFixedWidth ?? false)));
         this.setupDragAndDropSupport(parent, this.container);
@@ -711,7 +713,7 @@ let EditorPart = class EditorPart extends Part {
         this.notifyGroupIndexChange();
     }
     doCreateGridControlWithPreviousState() {
-        const uiState = this.workspaceMemento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY];
+        const uiState = this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
         if (uiState?.serializedGrid) {
             try {
                 this.mostRecentActiveGroups = uiState.mostRecentActiveGroups;
@@ -809,19 +811,19 @@ let EditorPart = class EditorPart extends Part {
                 mostRecentActiveGroups: this.mostRecentActiveGroups
             };
             if (this.isEmpty) {
-                delete this.workspaceMemento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY];
+                delete this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY];
             }
             else {
-                this.workspaceMemento[EditorPart.EDITOR_PART_UI_STATE_STORAGE_KEY] = uiState;
+                this.workspaceMemento[EditorPart_1.EDITOR_PART_UI_STATE_STORAGE_KEY] = uiState;
             }
         }
         if (this.centeredLayoutWidget) {
             const centeredLayoutState = this.centeredLayoutWidget.state;
             if (this.centeredLayoutWidget.isDefault(centeredLayoutState)) {
-                delete this.profileMemento[EditorPart.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY];
+                delete this.profileMemento[EditorPart_1.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY];
             }
             else {
-                this.profileMemento[EditorPart.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY] = centeredLayoutState;
+                this.profileMemento[EditorPart_1.EDITOR_PART_CENTERED_VIEW_STORAGE_KEY] = centeredLayoutState;
             }
         }
         super.saveState();
@@ -838,7 +840,7 @@ let EditorPart = class EditorPart extends Part {
         super.dispose();
     }
 };
-EditorPart = ( __decorate([
+EditorPart = EditorPart_1 = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, IThemeService)),
     ( __param(2, IConfigurationService)),

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

@@ -23,7 +23,9 @@ import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { truncate } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var EditorPlaceholder_1, WorkspaceTrustRequiredPlaceholderEditor_1, ErrorPlaceholderEditor_1;
 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);
@@ -52,7 +54,7 @@ let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
         clearNode(container);
         const disposables = ( new DisposableStore());
         const { icon, label, actions } = await this.getContents(input, options, disposables);
-        const truncatedLabel = truncate(label, EditorPlaceholder.PLACEHOLDER_LABEL_MAX_LENGTH);
+        const truncatedLabel = truncate(label, EditorPlaceholder_1.PLACEHOLDER_LABEL_MAX_LENGTH);
         const iconContainer = container.appendChild($('.editor-placeholder-icon-container'));
         const iconWidget = ( new SimpleIconLabel(iconContainer));
         iconWidget.text = icon;
@@ -103,22 +105,23 @@ let EditorPlaceholder = class EditorPlaceholder extends EditorPane {
         super.dispose();
     }
 };
-EditorPlaceholder = ( __decorate([
+EditorPlaceholder = EditorPlaceholder_1 = ( __decorate([
     ( __param(1, ITelemetryService)),
     ( __param(2, IThemeService)),
     ( __param(3, IStorageService))
 ], EditorPlaceholder));
 let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceholderEditor extends EditorPlaceholder {
+    static { WorkspaceTrustRequiredPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.workspaceTrustRequiredEditor'; }
     static { this.LABEL = ( localize('trustRequiredEditor', "Workspace Trust Required")); }
-    static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor, WorkspaceTrustRequiredPlaceholderEditor.ID, WorkspaceTrustRequiredPlaceholderEditor.LABEL); }
+    static { this.DESCRIPTOR = EditorPaneDescriptor.create(WorkspaceTrustRequiredPlaceholderEditor_1, WorkspaceTrustRequiredPlaceholderEditor_1.ID, WorkspaceTrustRequiredPlaceholderEditor_1.LABEL); }
     constructor(telemetryService, themeService, commandService, workspaceService, storageService) {
-        super(WorkspaceTrustRequiredPlaceholderEditor.ID, telemetryService, themeService, storageService);
+        super(WorkspaceTrustRequiredPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
         this.commandService = commandService;
         this.workspaceService = workspaceService;
     }
     getTitle() {
-        return WorkspaceTrustRequiredPlaceholderEditor.LABEL;
+        return WorkspaceTrustRequiredPlaceholderEditor_1.LABEL;
     }
     async getContents() {
         return {
@@ -141,7 +144,7 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         };
     }
 };
-WorkspaceTrustRequiredPlaceholderEditor = ( __decorate([
+WorkspaceTrustRequiredPlaceholderEditor = WorkspaceTrustRequiredPlaceholderEditor_1 = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, IThemeService)),
     ( __param(2, ICommandService)),
@@ -149,11 +152,12 @@ WorkspaceTrustRequiredPlaceholderEditor = ( __decorate([
     ( __param(4, IStorageService))
 ], WorkspaceTrustRequiredPlaceholderEditor));
 let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlaceholder {
+    static { ErrorPlaceholderEditor_1 = this; }
     static { this.ID = 'workbench.editors.errorEditor'; }
     static { this.LABEL = ( localize('errorEditor', "Error Editor")); }
-    static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor, ErrorPlaceholderEditor.ID, ErrorPlaceholderEditor.LABEL); }
+    static { this.DESCRIPTOR = EditorPaneDescriptor.create(ErrorPlaceholderEditor_1, ErrorPlaceholderEditor_1.ID, ErrorPlaceholderEditor_1.LABEL); }
     constructor(telemetryService, themeService, storageService, fileService, dialogService) {
-        super(ErrorPlaceholderEditor.ID, telemetryService, themeService, storageService);
+        super(ErrorPlaceholderEditor_1.ID, telemetryService, themeService, storageService);
         this.fileService = fileService;
         this.dialogService = dialogService;
     }
@@ -226,7 +230,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         return { icon, label, actions: actions ?? [] };
     }
 };
-ErrorPlaceholderEditor = ( __decorate([
+ErrorPlaceholderEditor = ErrorPlaceholderEditor_1 = ( __decorate([
     ( __param(0, ITelemetryService)),
     ( __param(1, IThemeService)),
     ( __param(2, IStorageService)),

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

@@ -12,6 +12,7 @@ import { getIconClasses } from 'monaco-editor/esm/vs/editor/common/services/getI
 import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore } from 'monaco-editor/esm/vs/base/common/fuzzyScorer.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+var ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1, AllEditorsByAppearanceQuickAccess_1, AllEditorsByMostRecentlyUsedQuickAccess_1;
 let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends PickerQuickAccessProvider {
     constructor(prefix, editorGroupService, editorService, modelService, languageService) {
         super(prefix, {
@@ -155,25 +156,27 @@ BaseEditorQuickAccessProvider = ( __decorate([
     ( __param(4, ILanguageService))
 ], BaseEditorQuickAccessProvider));
 let ActiveGroupEditorsByMostRecentlyUsedQuickAccess = class ActiveGroupEditorsByMostRecentlyUsedQuickAccess extends BaseEditorQuickAccessProvider {
+    static { ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1 = this; }
     static { this.PREFIX = 'edt active '; }
     constructor(editorGroupService, editorService, modelService, languageService) {
-        super(ActiveGroupEditorsByMostRecentlyUsedQuickAccess.PREFIX, editorGroupService, editorService, modelService, languageService);
+        super(ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1.PREFIX, editorGroupService, editorService, modelService, languageService);
     }
     doGetEditors() {
         const group = this.editorGroupService.activeGroup;
         return ( group.getEditors(0 ).map(editor => ({ editor, groupId: group.id })));
     }
 };
-ActiveGroupEditorsByMostRecentlyUsedQuickAccess = ( __decorate([
+ActiveGroupEditorsByMostRecentlyUsedQuickAccess = ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1 = ( __decorate([
     ( __param(0, IEditorGroupsService)),
     ( __param(1, IEditorService)),
     ( __param(2, IModelService)),
     ( __param(3, ILanguageService))
 ], ActiveGroupEditorsByMostRecentlyUsedQuickAccess));
 let AllEditorsByAppearanceQuickAccess = class AllEditorsByAppearanceQuickAccess extends BaseEditorQuickAccessProvider {
+    static { AllEditorsByAppearanceQuickAccess_1 = this; }
     static { this.PREFIX = 'edt '; }
     constructor(editorGroupService, editorService, modelService, languageService) {
-        super(AllEditorsByAppearanceQuickAccess.PREFIX, editorGroupService, editorService, modelService, languageService);
+        super(AllEditorsByAppearanceQuickAccess_1.PREFIX, editorGroupService, editorService, modelService, languageService);
     }
     doGetEditors() {
         const entries = [];
@@ -185,16 +188,17 @@ let AllEditorsByAppearanceQuickAccess = class AllEditorsByAppearanceQuickAccess
         return entries;
     }
 };
-AllEditorsByAppearanceQuickAccess = ( __decorate([
+AllEditorsByAppearanceQuickAccess = AllEditorsByAppearanceQuickAccess_1 = ( __decorate([
     ( __param(0, IEditorGroupsService)),
     ( __param(1, IEditorService)),
     ( __param(2, IModelService)),
     ( __param(3, ILanguageService))
 ], AllEditorsByAppearanceQuickAccess));
 let AllEditorsByMostRecentlyUsedQuickAccess = class AllEditorsByMostRecentlyUsedQuickAccess extends BaseEditorQuickAccessProvider {
+    static { AllEditorsByMostRecentlyUsedQuickAccess_1 = this; }
     static { this.PREFIX = 'edt mru '; }
     constructor(editorGroupService, editorService, modelService, languageService) {
-        super(AllEditorsByMostRecentlyUsedQuickAccess.PREFIX, editorGroupService, editorService, modelService, languageService);
+        super(AllEditorsByMostRecentlyUsedQuickAccess_1.PREFIX, editorGroupService, editorService, modelService, languageService);
     }
     doGetEditors() {
         const entries = [];
@@ -204,7 +208,7 @@ let AllEditorsByMostRecentlyUsedQuickAccess = class AllEditorsByMostRecentlyUsed
         return entries;
     }
 };
-AllEditorsByMostRecentlyUsedQuickAccess = ( __decorate([
+AllEditorsByMostRecentlyUsedQuickAccess = AllEditorsByMostRecentlyUsedQuickAccess_1 = ( __decorate([
     ( __param(0, IEditorGroupsService)),
     ( __param(1, IEditorService)),
     ( __param(2, IModelService)),