@codingame/monaco-vscode-view-common-service-override 9.0.2 → 10.0.0

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

@@ -11,8 +11,7 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ILanguageStatusService } from 'vscode/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { ShowTooltipCommand, StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { ShowTooltipCommand } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
 import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
@@ -21,7 +20,6 @@ import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -48,11 +46,11 @@ let StoredCounter = class StoredCounter {
         this._key = _key;
     }
     get value() {
-        return this._storageService.getNumber(this._key, StorageScope.PROFILE, 0);
+        return this._storageService.getNumber(this._key, 0 , 0);
     }
     increment() {
         const n = this.value + 1;
-        this._storageService.store(this._key, n, StorageScope.PROFILE, StorageTarget.MACHINE);
+        this._storageService.store(this._key, n, 0 , 1 );
         return n;
     }
 };
@@ -93,7 +91,7 @@ let LanguageStatus = class LanguageStatus {
         this._dedicated = ( (new Set()));
         this._dedicatedEntries = ( (new Map()));
         this._renderDisposables = ( (new DisposableStore()));
-        _storageService.onDidChangeValue(StorageScope.PROFILE, LanguageStatus_1._keyDedicatedItems, this._disposables)(this._handleStorageChange, this, this._disposables);
+        _storageService.onDidChangeValue(0 , LanguageStatus_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);
@@ -118,7 +116,7 @@ let LanguageStatus = class LanguageStatus {
         this._update();
     }
     _restoreState() {
-        const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, StorageScope.PROFILE, '[]');
+        const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, 0 , '[]');
         try {
             const ids = JSON.parse(raw);
             this._dedicated = ( (new Set(ids)));
@@ -129,11 +127,11 @@ let LanguageStatus = class LanguageStatus {
     }
     _storeState() {
         if (this._dedicated.size === 0) {
-            this._storageService.remove(LanguageStatus_1._keyDedicatedItems, StorageScope.PROFILE);
+            this._storageService.remove(LanguageStatus_1._keyDedicatedItems, 0 );
         }
         else {
             const raw = JSON.stringify(Array.from(( (this._dedicated.keys()))));
-            this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, StorageScope.PROFILE, StorageTarget.USER);
+            this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, 0 , 0 );
         }
     }
     _createViewModel(editor) {
@@ -182,14 +180,14 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(4321, "Editor Language Status")),
-                ariaLabel: ( localize(4322, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(4430, "Editor Language Status")),
+                ariaLabel: ( localize(4431, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: element,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
             };
             if (!this._combinedEntry) {
-                this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus_1._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.LEFT, compact: true });
+                this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus_1._id, 1 , { id: 'status.editor.mode', alignment: 0 , compact: true });
             }
             else {
                 this._combinedEntry.update(props);
@@ -231,7 +229,7 @@ let LanguageStatus = class LanguageStatus {
             const props = LanguageStatus_1._asStatusbarEntry(status);
             let entry = this._dedicatedEntries.get(status.id);
             if (!entry) {
-                entry = this._statusBarService.addEntry(props, status.id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT });
+                entry = this._statusBarService.addEntry(props, status.id, 1 , { id: 'status.editor.mode', alignment: 1  });
             }
             else {
                 entry.update(props);
@@ -280,10 +278,12 @@ let LanguageStatus = class LanguageStatus {
             }, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService))));
         }
         const actionBar = ( (new ActionBar(right, { hoverDelegate: nativeHoverDelegate })));
+        const actionLabel = isPinned ? ( localize(4432, "Remove from Status Bar")) : ( localize(4433, "Add to Status Bar"));
+        actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
         if (!isPinned) {
-            action = ( (new Action('pin', ( localize(4323, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
+            action = ( (new Action('pin', actionLabel, ThemeIcon.asClassName(Codicon.pin), true, () => {
                 this._dedicated.add(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, true);
                 this._update();
@@ -291,7 +291,7 @@ let LanguageStatus = class LanguageStatus {
             })));
         }
         else {
-            action = ( (new Action('unpin', ( localize(4324, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
+            action = ( (new Action('unpin', actionLabel, ThemeIcon.asClassName(Codicon.pinned), true, () => {
                 this._dedicated.delete(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, false);
                 this._update();
@@ -333,10 +333,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(4325, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(4434, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(4326, '{0}', textValue)) };
+            return { label: ( localize(4435, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -349,7 +349,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(4327, '{0} (Language Status)', item.name)),
+            name: ( localize(4436, '{0} (Language Status)', item.name)),
             text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -367,17 +367,17 @@ LanguageStatus = LanguageStatus_1 = ( (__decorate([
     ( (__param(4, IOpenerService))),
     ( (__param(5, IStorageService)))
 ], LanguageStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, 3 );
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(4328, "Reset Language Status Interaction Counter")),
+            title: ( localize2(4437, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove('languageStatus.interactCount', StorageScope.PROFILE);
+        accessor.get(IStorageService).remove('languageStatus.interactCount', 0 );
     }
 });

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

@@ -6,13 +6,12 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { ILanguageStatusService } from 'vscode/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
 import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
 const openSettingsCommand = 'workbench.action.openSettings';
-const configureSettingsLabel = ( localize(4335, "Configure"));
+const configureSettingsLabel = ( localize(4444, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -42,9 +41,9 @@ LimitIndicatorContribution = ( (__decorate([
 class ColorDecorationAccessor {
     constructor() {
         this.id = 'decoratorsLimitInfo';
-        this.name = ( localize(4336, 'Color Decorator Status'));
-        this.label = ( localize(4337, 'Color Decorators'));
-        this.source = ( localize(4338, 'Color Decorators'));
+        this.name = ( localize(4445, 'Color Decorator Status'));
+        this.label = ( localize(4446, 'Color Decorators'));
+        this.source = ( localize(4447, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -54,9 +53,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localize(4339, 'Folding Status'));
-        this.label = ( localize(4340, 'Folding Ranges'));
-        this.source = ( localize(4341, 'Folding'));
+        this.name = ( localize(4448, 'Folding Status'));
+        this.label = ( localize(4449, 'Folding Ranges'));
+        this.source = ( localize(4450, 'Folding'));
         this.settingsId = 'editor.foldingMaximumRegions';
     }
     getLimitReporter(editor) {
@@ -98,7 +97,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity$1.Warning,
                 label: this.accessor.label,
-                detail: ( localize(4342, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(4451, 'only {0} shown for performance reasons', info.limited)),
                 command: { id: openSettingsCommand, arguments: [this.accessor.settingsId], title: configureSettingsLabel },
                 accessibilityInfo: undefined,
                 source: this.accessor.source,
@@ -112,6 +111,6 @@ class LanguageStatusEntry {
         this._indicatorChangeListener = undefined;
     }
 }
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LimitIndicatorContribution, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LimitIndicatorContribution, 3 );
 
 export { LimitIndicatorContribution };

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

@@ -6,7 +6,6 @@ import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/action
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { MergeEditorInputData } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor } from '../view/mergeEditor.js';
@@ -55,7 +54,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9768, 'Open Merge Editor')),
+            title: ( localize2(9850, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -134,7 +133,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9769, "Mixed Layout")),
+            title: ( localize2(9851, "Mixed Layout")),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
@@ -158,7 +157,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9770, 'Column Layout')),
+            title: ( localize2(9852, 'Column Layout')),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -180,7 +179,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9771, "Show Non-Conflicting Changes")),
+            title: ( localize2(9853, "Show Non-Conflicting Changes")),
             toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
@@ -204,7 +203,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9772, "Show Base")),
+            title: ( localize2(9854, "Show Base")),
             toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
@@ -230,7 +229,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9773, "Show Base Top")),
+            title: ( localize2(9855, "Show Base Top")),
             toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
@@ -253,7 +252,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9774, "Show Base Center")),
+            title: ( localize2(9856, "Show Base Center")),
             toggled: ( (ContextKeyExpr.and(
                 ctxMergeEditorShowBase,
                  (ctxMergeEditorShowBaseAtTop.negate())
@@ -275,13 +274,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9775, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9857, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9776, "Open File")),
+            title: ( localize2(9858, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -302,7 +301,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9777, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9859, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -326,7 +325,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9778, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9860, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -350,7 +349,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9779, "Toggle Current Conflict from Left")),
+            title: ( localize2(9861, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -364,7 +363,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9780, "Toggle Current Conflict from Right")),
+            title: ( localize2(9862, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -378,8 +377,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9781, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9782, 'Compare With Base')),
+            title: ( localize2(9863, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9864, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -396,8 +395,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9783, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9782, 'Compare With Base')),
+            title: ( localize2(9865, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9864, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -433,7 +432,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9784, "Open Base File")),
+            title: ( localize2(9866, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -448,7 +447,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9785, "Accept All Changes from Left")),
+            title: ( localize2(9867, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -464,7 +463,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9786, "Accept All Changes from Right")),
+            title: ( localize2(9868, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -480,8 +479,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9787, "Reset Result")),
-            shortTitle: ( localize(9788, 'Reset')),
+            title: ( localize2(9869, "Reset Result")),
+            shortTitle: ( localize(9870, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -497,12 +496,12 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9789, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9871, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove(StorageCloseWithConflicts, StorageScope.PROFILE);
+        accessor.get(IStorageService).remove(StorageCloseWithConflicts, 0 );
     }
 }
 class AcceptMerge extends MergeEditorAction2 {
@@ -510,7 +509,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9790, "Complete Merge")),
+            title: ( localize2(9872, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -521,12 +520,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9791,
+                    9873,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9792, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9793, "&&Complete with Conflicts"))
+                detail: ( localize(9874, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9875, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -13,13 +13,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9794, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9876, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9795, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9877, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -31,8 +31,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9796, 'Merge Editor')),
-                message: ( localize(9797, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "No active merge editor"))
             });
             return;
         }
@@ -51,8 +51,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9796, 'Merge Editor')),
-            message: ( localize(9798, "Successfully copied merge editor state")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9880, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9799, "Save Merge Editor State to Folder")),
+            title: ( localize2(9881, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -75,8 +75,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9796, 'Merge Editor')),
-                message: ( localize(9797, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "No active merge editor"))
             });
             return;
         }
@@ -88,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9800, 'Select folder to save to'))
+            title: ( localize(9882, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9796, 'Merge Editor')),
-            message: ( localize(9801, "Successfully saved merge editor state to folder")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9883, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -116,7 +116,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9802, "Load Merge Editor State from Folder")),
+            title: ( localize2(9884, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -135,7 +135,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9800, 'Select folder to save to'))
+                title: ( localize(9882, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -4,16 +4,15 @@ import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/confi
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { OpenResultResource, SetMixedLayout, SetColumnLayout, OpenMergeEditor, OpenBaseFile, ShowNonConflictingChanges, ShowHideBase, ShowHideTopBase, ShowHideCenterBase, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, ToggleActiveConflictInput1, ToggleActiveConflictInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, AcceptAllInput1, AcceptAllInput2, ResetToBaseAndAutoMergeCommand, AcceptMerge, ResetCloseWithConflictsChoice } from './commands/commands.js';
 import { MergeEditorCopyContentsToJSON, MergeEditorSaveContentsToFolder, MergeEditorLoadContentsFromFolder } from './commands/devCommands.js';
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4329, "Merge Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4438, "Merge Editor"))), [
     ( (new SyncDescriptor(MergeEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -24,8 +23,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(4330, "Uses the legacy diffing algorithm.")),
-                ( localize(4331, "Uses the advanced diffing algorithm.")),
+                ( localize(4439, "Uses the legacy diffing algorithm.")),
+                ( localize(4440, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {
@@ -60,5 +59,5 @@ registerAction2(MergeEditorSaveContentsToFolder);
 registerAction2(MergeEditorLoadContentsFromFolder);
 ( (Registry
     .as(Extensions$1.Workbench)))
-    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, LifecyclePhase.Restored);
-registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, WorkbenchPhase.BlockStartup );
+    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
+registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js

@@ -11,19 +11,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11258, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11259, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11260, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11261, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11262, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11263, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11264, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11265, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11266, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11267, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11268, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11369, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11370, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11371, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11372, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11373, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11374, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11375, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11376, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11377, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11378, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11379, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11269, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11270, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11380, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11381, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js

@@ -1,11 +1,12 @@
 import { h, reset } from 'vscode/vscode/vs/base/browser/dom';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/event';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/arrays';
+import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { LineRange } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 
 class EditorGutter extends Disposable {