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

package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js

@@ -9,7 +9,7 @@ import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiati
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
+import { preventEditorClose, EditorResourceAccessor, SideBySideEditor, EditorCloseMethod } from '../../../../common/editor.js';
 import { SaveAllInGroupAction, CloseGroupAction } from '../fileActions.js';
 import { OpenEditor, OpenEditorsFocusedContext, ExplorerFocusedContext } from '../../common/files.js';
 import { CloseEditorAction, UnpinEditorAction } from '../../../../browser/parts/editor/editorActions.js';
@@ -30,7 +30,6 @@ import { ViewPane } from '../../../../browser/parts/views/viewPane.js';
 import { DataTransfers } from 'monaco-editor/esm/vs/base/browser/dnd.js';
 import { memoize } from 'monaco-editor/esm/vs/base/common/decorators.js';
 import { NativeDragAndDropData, ElementsDragAndDropData } from 'monaco-editor/esm/vs/base/browser/ui/list/listView.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { IWorkingCopyService } from '../../../../services/workingCopy/common/workingCopyService.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IViewDescriptorService } from '../../../../common/views.js';
@@ -38,8 +37,10 @@ import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/open
 import { compareFileNamesDefault } from 'monaco-editor/esm/vs/base/common/comparers.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { extUriIgnorePathCase } from 'monaco-editor/esm/vs/base/common/resources.js';
+var OpenEditorsView_1;
 const $ = dom.$;
 let OpenEditorsView = class OpenEditorsView extends ViewPane {
+    static { OpenEditorsView_1 = this; }
     static { this.DEFAULT_VISIBLE_OPEN_EDITORS = 9; }
     static { this.DEFAULT_MIN_VISIBLE_OPEN_EDITORS = 0; }
     static { this.ID = 'workbench.explorer.openEditorsView'; }
@@ -195,7 +196,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
                 const resource = element.getResource();
                 this.dirtyEditorFocusedContext.set(element.editor.isDirty() && !element.editor.isSaving());
                 this.readonlyEditorFocusedContext.set(!!element.editor.isReadonly());
-                this.resourceContext.set(withUndefinedAsNull(resource));
+                this.resourceContext.set(resource ?? null);
             }
             else if (!!element) {
                 this.groupFocusedContext.set(true);
@@ -203,6 +204,9 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         });
         this._register(this.list.onMouseMiddleClick(e => {
             if (e && e.element instanceof OpenEditor) {
+                if (preventEditorClose(e.element.group, e.element.editor, EditorCloseMethod.MOUSE, this.editorGroupService.partOptions)) {
+                    return;
+                }
                 e.element.group.closeEditor(e.element.editor, { preserveFocus: true });
             }
         }));
@@ -373,7 +377,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     getMaxExpandedBodySize() {
         let minVisibleOpenEditors = this.configurationService.getValue('explorer.openEditors.minVisible');
         if (typeof minVisibleOpenEditors !== 'number') {
-            minVisibleOpenEditors = OpenEditorsView.DEFAULT_MIN_VISIBLE_OPEN_EDITORS;
+            minVisibleOpenEditors = OpenEditorsView_1.DEFAULT_MIN_VISIBLE_OPEN_EDITORS;
         }
         const containerModel = this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id));
         if (containerModel.visibleViewDescriptors.length <= 1) {
@@ -384,11 +388,11 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
     getMinExpandedBodySize() {
         let visibleOpenEditors = this.configurationService.getValue('explorer.openEditors.visible');
         if (typeof visibleOpenEditors !== 'number') {
-            visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS;
+            visibleOpenEditors = OpenEditorsView_1.DEFAULT_VISIBLE_OPEN_EDITORS;
         }
         return this.computeMinExpandedBodySize(visibleOpenEditors);
     }
-    computeMinExpandedBodySize(visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS) {
+    computeMinExpandedBodySize(visibleOpenEditors = OpenEditorsView_1.DEFAULT_VISIBLE_OPEN_EDITORS) {
         const itemsToShow = Math.min(Math.max(visibleOpenEditors, 1), this.elementCount);
         return itemsToShow * OpenEditorsDelegate.ITEM_HEIGHT;
     }
@@ -401,7 +405,7 @@ let OpenEditorsView = class OpenEditorsView extends ViewPane {
         return dom.getLargestChildWidth(parentNode, childNodes);
     }
 };
-OpenEditorsView = ( __decorate([
+OpenEditorsView = OpenEditorsView_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IViewDescriptorService)),
     ( __param(3, IContextMenuService)),

package/vscode/src/vs/workbench/contrib/files/common/files.d.ts

@@ -17,4 +17,4 @@ interface ISortOrderConfiguration {
     lexicographicOptions: LexicographicOptions;
 }
 
-export { ISortOrderConfiguration, LexicographicOptions, SortOrder };
+export { type ISortOrderConfiguration, LexicographicOptions, SortOrder };

package/vscode/src/vs/workbench/contrib/files/common/files.js

@@ -9,6 +9,7 @@ import { ITextFileService } from '../../../services/textfile/common/textfiles.js
 import { InputFocusedContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
+var TextFileContentProvider_1;
 const VIEWLET_ID = 'workbench.view.explorer';
 const VIEW_ID = 'workbench.explorer.fileView';
 const ExplorerViewletVisibleContext = ( new RawContextKey(
@@ -118,7 +119,7 @@ const TEXT_FILE_EDITOR_ID = 'workbench.editors.files.textFileEditor';
 const FILE_EDITOR_INPUT_ID = 'workbench.editors.files.fileEditorInput';
 const BINARY_FILE_EDITOR_ID = 'workbench.editors.files.binaryFileEditor';
 const BINARY_TEXT_FILE_MODE = 'code-text-binary';
-let TextFileContentProvider = class TextFileContentProvider extends Disposable {
+let TextFileContentProvider = TextFileContentProvider_1 = class TextFileContentProvider extends Disposable {
     constructor(textFileService, fileService, languageService, modelService) {
         super();
         this.textFileService = textFileService;
@@ -129,7 +130,7 @@ let TextFileContentProvider = class TextFileContentProvider extends Disposable {
     }
     static async open(resource, scheme, label, editorService, options) {
         await editorService.openEditor({
-            original: { resource: TextFileContentProvider.resourceToTextFile(scheme, resource) },
+            original: { resource: TextFileContentProvider_1.resourceToTextFile(scheme, resource) },
             modified: { resource },
             label,
             options
@@ -146,7 +147,7 @@ let TextFileContentProvider = class TextFileContentProvider extends Disposable {
         if (!resource.query) {
             return null;
         }
-        const savedFileResource = TextFileContentProvider.textFileToResource(resource);
+        const savedFileResource = TextFileContentProvider_1.textFileToResource(resource);
         const codeEditorModel = await this.resolveEditorModel(resource);
         if (!this.fileWatcherDisposable.value) {
             this.fileWatcherDisposable.value = this.fileService.onDidFilesChange(changes => {
@@ -161,7 +162,7 @@ let TextFileContentProvider = class TextFileContentProvider extends Disposable {
         return codeEditorModel;
     }
     async resolveEditorModel(resource, createAsNeeded = true) {
-        const savedFileResource = TextFileContentProvider.textFileToResource(resource);
+        const savedFileResource = TextFileContentProvider_1.textFileToResource(resource);
         const content = await this.textFileService.readStream(savedFileResource);
         let codeEditorModel = this.modelService.getModel(resource);
         if (codeEditorModel) {
@@ -181,7 +182,7 @@ let TextFileContentProvider = class TextFileContentProvider extends Disposable {
         return codeEditorModel;
     }
 };
-TextFileContentProvider = ( __decorate([
+TextFileContentProvider = TextFileContentProvider_1 = ( __decorate([
     ( __param(0, ITextFileService)),
     ( __param(1, IFileService)),
     ( __param(2, ILanguageService)),

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

@@ -8,7 +8,9 @@ import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/c
 import { editorConfigurationBaseNode } from 'monaco-editor/esm/vs/editor/common/config/editorConfigurationSchema.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+var DefaultFoldingRangeProvider_1;
 let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disposable {
+    static { DefaultFoldingRangeProvider_1 = this; }
     static { this.configName = 'editor.defaultFoldingRangeProvider'; }
     static { this.extensionIds = []; }
     static { this.extensionItemLabels = []; }
@@ -23,12 +25,12 @@ let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disp
     }
     async _updateConfigValues() {
         await this._extensionService.whenInstalledExtensionsRegistered();
-        DefaultFoldingRangeProvider.extensionIds.length = 0;
-        DefaultFoldingRangeProvider.extensionItemLabels.length = 0;
-        DefaultFoldingRangeProvider.extensionDescriptions.length = 0;
-        DefaultFoldingRangeProvider.extensionIds.push(null);
-        DefaultFoldingRangeProvider.extensionItemLabels.push(( nls.localize('null', 'All')));
-        DefaultFoldingRangeProvider.extensionDescriptions.push(( nls.localize('nullFormatterDescription', "All active folding range providers")));
+        DefaultFoldingRangeProvider_1.extensionIds.length = 0;
+        DefaultFoldingRangeProvider_1.extensionItemLabels.length = 0;
+        DefaultFoldingRangeProvider_1.extensionDescriptions.length = 0;
+        DefaultFoldingRangeProvider_1.extensionIds.push(null);
+        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( nls.localize('null', 'All')));
+        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( nls.localize('nullFormatterDescription', "All active folding range providers")));
         const languageExtensions = [];
         const otherExtensions = [];
         for (const extension of this._extensionService.extensions) {
@@ -43,25 +45,25 @@ let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disp
         }
         const sorter = (a, b) => a.name.localeCompare(b.name);
         for (const extension of languageExtensions.sort(sorter)) {
-            DefaultFoldingRangeProvider.extensionIds.push(extension.identifier.value);
-            DefaultFoldingRangeProvider.extensionItemLabels.push(extension.displayName ?? '');
-            DefaultFoldingRangeProvider.extensionDescriptions.push(extension.description ?? '');
+            DefaultFoldingRangeProvider_1.extensionIds.push(extension.identifier.value);
+            DefaultFoldingRangeProvider_1.extensionItemLabels.push(extension.displayName ?? '');
+            DefaultFoldingRangeProvider_1.extensionDescriptions.push(extension.description ?? '');
         }
         for (const extension of otherExtensions.sort(sorter)) {
-            DefaultFoldingRangeProvider.extensionIds.push(extension.identifier.value);
-            DefaultFoldingRangeProvider.extensionItemLabels.push(extension.displayName ?? '');
-            DefaultFoldingRangeProvider.extensionDescriptions.push(extension.description ?? '');
+            DefaultFoldingRangeProvider_1.extensionIds.push(extension.identifier.value);
+            DefaultFoldingRangeProvider_1.extensionItemLabels.push(extension.displayName ?? '');
+            DefaultFoldingRangeProvider_1.extensionDescriptions.push(extension.description ?? '');
         }
     }
     _selectFoldingRangeProvider(providers, document) {
-        const value = this._configurationService.getValue(DefaultFoldingRangeProvider.configName, { overrideIdentifier: document.getLanguageId() });
+        const value = this._configurationService.getValue(DefaultFoldingRangeProvider_1.configName, { overrideIdentifier: document.getLanguageId() });
         if (value) {
             return providers.filter(p => p.id === value);
         }
         return undefined;
     }
 };
-DefaultFoldingRangeProvider = ( __decorate([
+DefaultFoldingRangeProvider = DefaultFoldingRangeProvider_1 = ( __decorate([
     ( __param(0, IExtensionService)),
     ( __param(1, IConfigurationService))
 ], DefaultFoldingRangeProvider));

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -12,7 +12,9 @@ import { AudioCue, IAudioCueService } from 'monaco-editor/esm/vs/platform/audioC
 import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { Link } from 'monaco-editor/esm/vs/platform/opener/browser/link.js';
+var InlayHintsAccessibility_1;
 let InlayHintsAccessibility = class InlayHintsAccessibility {
+    static { InlayHintsAccessibility_1 = this; }
     static { this.IsReading = ( new RawContextKey(
         'isReadingLineWithInlayHints',
         false,
@@ -23,7 +25,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
     )); }
     static { this.ID = 'editor.contrib.InlayHintsAccessibility'; }
     static get(editor) {
-        return editor.getContribution(InlayHintsAccessibility.ID) ?? undefined;
+        return editor.getContribution(InlayHintsAccessibility_1.ID) ?? undefined;
     }
     constructor(_editor, contextKeyService, _audioCueService, _instaService) {
         this._editor = _editor;
@@ -35,7 +37,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._ariaElement.className = 'inlayhint-accessibility-element';
         this._ariaElement.tabIndex = 0;
         this._ariaElement.setAttribute('aria-description', ( localize('description', "Code with Inlay Hint Information")));
-        this._ctxIsReading = InlayHintsAccessibility.IsReading.bindTo(contextKeyService);
+        this._ctxIsReading = InlayHintsAccessibility_1.IsReading.bindTo(contextKeyService);
     }
     dispose() {
         this._sessionDispoosables.dispose();
@@ -125,7 +127,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._editor.focus();
     }
 };
-InlayHintsAccessibility = ( __decorate([
+InlayHintsAccessibility = InlayHintsAccessibility_1 = ( __decorate([
     ( __param(1, IContextKeyService)),
     ( __param(2, IAudioCueService)),
     ( __param(3, IInstantiationService))

package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js

@@ -12,9 +12,11 @@ import { IInteractiveHistoryService } from './interactiveHistoryService.js';
 import { NotebookEditorInput } from '../../../../../../../override/vs/workbench/contrib/notebook/common/notebookEditorInput.js';
 import { INotebookService } from '../../notebook/common/notebookService.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var InteractiveEditorInput_1;
 let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
+    static { InteractiveEditorInput_1 = this; }
     static create(instantiationService, resource, inputResource, title, language) {
-        return instantiationService.createInstance(InteractiveEditorInput, resource, inputResource, title, language);
+        return instantiationService.createInstance(InteractiveEditorInput_1, resource, inputResource, title, language);
     }
     static { this.windowNames = {}; }
     static setName(notebookUri, title) {
@@ -27,7 +29,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         return 'interactive';
     }
     get typeId() {
-        return InteractiveEditorInput.ID;
+        return InteractiveEditorInput_1.ID;
     }
     get language() {
         return this._inputModelRef?.object.textEditorModel.getLanguageId() ?? this._initLanguage;
@@ -54,7 +56,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         this._fileDialogService = _fileDialogService;
         this._notebookEditorInput = input;
         this._register(this._notebookEditorInput);
-        this.name = title ?? InteractiveEditorInput.windowNames[resource.path] ?? path.basename(resource.path, path.extname(resource.path));
+        this.name = title ?? InteractiveEditorInput_1.windowNames[resource.path] ?? path.basename(resource.path, path.extname(resource.path));
         this._initLanguage = languageId;
         this._resource = resource;
         this._inputResource = inputResource;
@@ -139,7 +141,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         if (super.matches(otherInput)) {
             return true;
         }
-        if (otherInput instanceof InteractiveEditorInput) {
+        if (otherInput instanceof InteractiveEditorInput_1) {
             return isEqual(this.resource, otherInput.resource) && isEqual(this.inputResource, otherInput.inputResource);
         }
         return false;
@@ -164,7 +166,7 @@ let InteractiveEditorInput = class InteractiveEditorInput extends EditorInput {
         return this._historyService;
     }
 };
-InteractiveEditorInput = ( __decorate([
+InteractiveEditorInput = InteractiveEditorInput_1 = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, ITextModelService)),
     ( __param(6, IInteractiveDocumentService)),

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

@@ -17,8 +17,10 @@ import { NOTEBOOK_EDITOR_EDITABLE } from '../../notebook/common/notebookContextK
 import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+var LanguageDetectionStatusContribution_1;
 const detectLanguageCommandId = 'editor.detectLanguage';
 let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribution {
+    static { LanguageDetectionStatusContribution_1 = this; }
     static { this._id = 'status.languageDetectionStatus'; }
     constructor(_languageDetectionService, _statusBarService, _configurationService, _editorService, _languageService, _keybindingService) {
         this._languageDetectionService = _languageDetectionService;
@@ -81,7 +83,7 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
                     text: '$(lightbulb-autofix)',
                 };
                 if (!this._combinedEntry) {
-                    this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution._id, 1 , { id: 'status.editor.mode', alignment: 1 , compact: true });
+                    this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution_1._id, 1 , { id: 'status.editor.mode', alignment: 1 , compact: true });
                 }
                 else {
                     this._combinedEntry.update(props);
@@ -94,7 +96,7 @@ let LanguageDetectionStatusContribution = class LanguageDetectionStatusContribut
         }
     }
 };
-LanguageDetectionStatusContribution = ( __decorate([
+LanguageDetectionStatusContribution = LanguageDetectionStatusContribution_1 = ( __decorate([
     ( __param(0, ILanguageDetectionService)),
     ( __param(1, IStatusbarService)),
     ( __param(2, IConfigurationService)),

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

@@ -7,10 +7,8 @@ import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
 import { getCodeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { Extensions } from '../../../common/contributions.js';
-import { STATUS_BAR_WARNING_ITEM_FOREGROUND, STATUS_BAR_WARNING_ITEM_BACKGROUND, STATUS_BAR_ERROR_ITEM_FOREGROUND, STATUS_BAR_ERROR_ITEM_BACKGROUND } from '../../../common/theme.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
 import { ShowTooltipCommand, IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
@@ -26,6 +24,7 @@ import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
+var EditorStatusContribution_1;
 class LanguageStatusViewModel {
     constructor(combined, dedicated) {
         this.combined = combined;
@@ -53,6 +52,7 @@ StoredCounter = ( __decorate([
     ( __param(0, IStorageService))
 ], StoredCounter));
 let EditorStatusContribution = class EditorStatusContribution {
+    static { EditorStatusContribution_1 = this; }
     static { this._id = 'status.languageStatus'; }
     static { this._keyDedicatedItems = 'languageStatus.dedicated'; }
     constructor(_languageStatusService, _statusBarService, _editorService, _openerService, _storageService) {
@@ -65,7 +65,7 @@ let EditorStatusContribution = class EditorStatusContribution {
         this._dedicated = ( new Set());
         this._dedicatedEntries = ( new Map());
         this._renderDisposables = ( new DisposableStore());
-        _storageService.onDidChangeValue(this._handleStorageChange, this, this._disposables);
+        _storageService.onDidChangeValue(0 , EditorStatusContribution_1._keyDedicatedItems, this._disposables)(this._handleStorageChange, this, this._disposables);
         this._restoreState();
         this._interactionCounter = ( new StoredCounter(_storageService, 'languageStatus.interactCount'));
         _languageStatusService.onDidChange(this._update, this, this._disposables);
@@ -85,15 +85,12 @@ let EditorStatusContribution = class EditorStatusContribution {
         dispose(( this._dedicatedEntries.values()));
         this._renderDisposables.dispose();
     }
-    _handleStorageChange(e) {
-        if (e.key !== EditorStatusContribution._keyDedicatedItems) {
-            return;
-        }
+    _handleStorageChange() {
         this._restoreState();
         this._update();
     }
     _restoreState() {
-        const raw = this._storageService.get(EditorStatusContribution._keyDedicatedItems, 0 , '[]');
+        const raw = this._storageService.get(EditorStatusContribution_1._keyDedicatedItems, 0 , '[]');
         try {
             const ids = JSON.parse(raw);
             this._dedicated = ( new Set(ids));
@@ -104,11 +101,11 @@ let EditorStatusContribution = class EditorStatusContribution {
     }
     _storeState() {
         if (this._dedicated.size === 0) {
-            this._storageService.remove(EditorStatusContribution._keyDedicatedItems, 0 );
+            this._storageService.remove(EditorStatusContribution_1._keyDedicatedItems, 0 );
         }
         else {
             const raw = JSON.stringify(Array.from(( this._dedicated.keys())));
-            this._storageService.store(EditorStatusContribution._keyDedicatedItems, raw, 0 , 0 );
+            this._storageService.store(EditorStatusContribution_1._keyDedicatedItems, raw, 0 , 0 );
         }
     }
     _createViewModel(editor) {
@@ -142,7 +139,7 @@ let EditorStatusContribution = class EditorStatusContribution {
         else {
             const [first] = model.combined;
             const showSeverity = first.severity >= Severity.Warning;
-            const text = EditorStatusContribution._severityToComboCodicon(first.severity);
+            const text = EditorStatusContribution_1._severityToComboCodicon(first.severity);
             let isOneBusy = false;
             const ariaLabels = [];
             const element = document.createElement('div');
@@ -164,7 +161,7 @@ let EditorStatusContribution = class EditorStatusContribution {
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
             };
             if (!this._combinedEntry) {
-                this._combinedEntry = this._statusBarService.addEntry(props, EditorStatusContribution._id, 1 , { id: 'status.editor.mode', alignment: 0 , compact: true });
+                this._combinedEntry = this._statusBarService.addEntry(props, EditorStatusContribution_1._id, 1 , { id: 'status.editor.mode', alignment: 0 , compact: true });
             }
             else {
                 this._combinedEntry.update(props);
@@ -202,7 +199,7 @@ let EditorStatusContribution = class EditorStatusContribution {
         }
         const newDedicatedEntries = ( new Map());
         for (const status of model.dedicated) {
-            const props = EditorStatusContribution._asStatusbarEntry(status);
+            const props = EditorStatusContribution_1._asStatusbarEntry(status);
             let entry = this._dedicatedEntries.get(status.id);
             if (!entry) {
                 entry = this._statusBarService.addEntry(props, status.id, 1 , { id: 'status.editor.mode', alignment: 1  });
@@ -222,7 +219,7 @@ let EditorStatusContribution = class EditorStatusContribution {
         const severity = document.createElement('div');
         severity.classList.add('severity', `sev${status.severity}`);
         severity.classList.toggle('show', showSeverity);
-        const severityText = EditorStatusContribution._severityToSingleCodicon(status.severity);
+        const severityText = EditorStatusContribution_1._severityToSingleCodicon(status.severity);
         dom.append(severity, ...renderLabelWithIcons(severityText));
         parent.appendChild(severity);
         const element = document.createElement('div');
@@ -312,15 +309,12 @@ let EditorStatusContribution = class EditorStatusContribution {
         }
     }
     static _asStatusbarEntry(item) {
-        let color;
-        let backgroundColor;
+        let kind;
         if (item.severity === Severity.Warning) {
-            color = themeColorFromId(STATUS_BAR_WARNING_ITEM_FOREGROUND);
-            backgroundColor = themeColorFromId(STATUS_BAR_WARNING_ITEM_BACKGROUND);
+            kind = 'warning';
         }
         else if (item.severity === Severity.Error) {
-            color = themeColorFromId(STATUS_BAR_ERROR_ITEM_FOREGROUND);
-            backgroundColor = themeColorFromId(STATUS_BAR_ERROR_ITEM_BACKGROUND);
+            kind = 'error';
         }
         return {
             name: ( localize('name.pattern', '{0} (Language Status)', item.name)),
@@ -328,13 +322,12 @@ let EditorStatusContribution = class EditorStatusContribution {
             ariaLabel: item.accessibilityInfo?.label ?? item.label,
             role: item.accessibilityInfo?.role,
             tooltip: item.command?.tooltip || ( new MarkdownString(item.detail, { isTrusted: true, supportThemeIcons: true })),
-            color,
-            backgroundColor,
+            kind,
             command: item.command
         };
     }
 };
-EditorStatusContribution = ( __decorate([
+EditorStatusContribution = EditorStatusContribution_1 = ( __decorate([
     ( __param(0, ILanguageStatusService)),
     ( __param(1, IStatusbarService)),
     ( __param(2, IEditorService)),

package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.js

@@ -5,7 +5,6 @@ import { flatten, isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/array
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Hasher } from 'monaco-editor/esm/vs/base/common/hash.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { splitLines } from 'monaco-editor/esm/vs/base/common/strings.js';
 import { unsupportedSchemas } from 'monaco-editor/esm/vs/platform/markers/common/markerService.js';
 function compareMarkersByUri(a, b) {
@@ -132,7 +131,7 @@ class MarkersModel {
         return this._total;
     }
     getResourceMarkers(resource) {
-        return withUndefinedAsNull(this.resourcesByUri.get(extUri.getComparisonKey(resource, true)));
+        return this.resourcesByUri.get(extUri.getComparisonKey(resource, true)) ?? null;
     }
     setResourceMarkers(resourcesMarkers) {
         const change = { added: ( new Set()), removed: ( new Set()), updated: ( new Set()) };

package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js

@@ -21,13 +21,15 @@ import { isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { unsupportedSchemas } from 'monaco-editor/esm/vs/platform/markers/common/markerService.js';
 import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
 const $ = dom.$;
 let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
+    static { MarkerSeverityColumnRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'severity'; }
     constructor(markersViewModel, instantiationService) {
         this.markersViewModel = markersViewModel;
         this.instantiationService = instantiationService;
-        this.templateId = MarkerSeverityColumnRenderer.TEMPLATE_ID;
+        this.templateId = MarkerSeverityColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
         const severityColumn = dom.append(container, $('.severity'));
@@ -65,14 +67,15 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
     }
     disposeTemplate(templateData) { }
 };
-MarkerSeverityColumnRenderer = ( (__decorate([
+MarkerSeverityColumnRenderer = MarkerSeverityColumnRenderer_1 = ( (__decorate([
     ( (__param(1, IInstantiationService)))
 ], MarkerSeverityColumnRenderer)));
 let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
+    static { MarkerCodeColumnRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'code'; }
     constructor(openerService) {
         this.openerService = openerService;
-        this.templateId = MarkerCodeColumnRenderer.TEMPLATE_ID;
+        this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
         const codeColumn = dom.append(container, $('.code'));
@@ -113,7 +116,7 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
     }
     disposeTemplate(templateData) { }
 };
-MarkerCodeColumnRenderer = ( (__decorate([
+MarkerCodeColumnRenderer = MarkerCodeColumnRenderer_1 = ( (__decorate([
     ( (__param(0, IOpenerService)))
 ], MarkerCodeColumnRenderer)));
 class MarkerMessageColumnRenderer {
@@ -133,10 +136,11 @@ class MarkerMessageColumnRenderer {
     disposeTemplate(templateData) { }
 }
 let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
+    static { MarkerFileColumnRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'file'; }
     constructor(labelService) {
         this.labelService = labelService;
-        this.templateId = MarkerFileColumnRenderer.TEMPLATE_ID;
+        this.templateId = MarkerFileColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
         const columnElement = dom.append(container, $('.file'));
@@ -154,7 +158,7 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
     }
     disposeTemplate(templateData) { }
 };
-MarkerFileColumnRenderer = ( (__decorate([
+MarkerFileColumnRenderer = MarkerFileColumnRenderer_1 = ( (__decorate([
     ( (__param(0, ILabelService)))
 ], MarkerFileColumnRenderer)));
 class MarkerOwnerColumnRenderer {

package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js

@@ -27,7 +27,6 @@ import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/com
 import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
 import { ResourceLabels } from '../../../browser/labels.js';
 import { MarkerSeverity, IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
-import { withUndefinedAsNull } from 'monaco-editor/esm/vs/base/common/types.js';
 import { Memento } from '../../../common/memento.js';
 import { FilterViewPane } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.js';
@@ -496,7 +495,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     }
     setCurrentActiveEditor() {
         const activeEditor = this.editorService.activeEditor;
-        this.currentActiveResource = activeEditor ? withUndefinedAsNull(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY })) : null;
+        this.currentActiveResource = activeEditor ? EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }) ?? null : null;
     }
     onSelected() {
         const selection = this.widget.getSelection();

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -15,7 +15,9 @@ import { MergeEditorTelemetry } from './telemetry.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+var MergeEditorInput_1;
 let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditorInput {
+    static { MergeEditorInput_1 = this; }
     static { this.ID = 'mergeEditor.Input'; }
     get useWorkingCopy() {
         return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
@@ -31,7 +33,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         this.closeHandler = {
             showConfirm: () => this._inputModel?.shouldConfirmClose() ?? false,
             confirm: async (editors) => {
-                assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput));
+                assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput_1));
                 const inputModels = ( editors.map(e => e.editor._inputModel)).filter(isDefined);
                 return await this._inputModel.confirmClose(inputModels);
             },
@@ -44,7 +46,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         super.dispose();
     }
     get typeId() {
-        return MergeEditorInput.ID;
+        return MergeEditorInput_1.ID;
     }
     get editorId() {
         return DEFAULT_EDITOR_ASSOCIATION.id;
@@ -68,7 +70,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
                 result: this.result,
             }));
             this._inputModel = inputModel;
-            this._register(autorun('fire dirty event', (reader) => {
+            this._register(autorun(reader => {
                 inputModel.isDirty.read(reader);
                 this._onDidChangeDirty.fire();
             }));
@@ -98,7 +100,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         if (this === otherInput) {
             return true;
         }
-        if (otherInput instanceof MergeEditorInput) {
+        if (otherInput instanceof MergeEditorInput_1) {
             return isEqual(this.base, otherInput.base)
                 && isEqual(this.input1.uri, otherInput.input1.uri)
                 && isEqual(this.input2.uri, otherInput.input2.uri)
@@ -123,7 +125,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         this._inputModel?.model.setLanguageId(languageId, source);
     }
 };
-MergeEditorInput = ( __decorate([
+MergeEditorInput = MergeEditorInput_1 = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IEditorService)),
     ( __param(6, ITextFileService)),