@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js

@@ -8,7 +8,7 @@ import { extname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -26,7 +26,7 @@ import { ContributedCustomEditors } from '../common/contributedCustomEditors.js'
 import { CustomEditorInput } from 'vscode/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 
 let CustomEditorService = class CustomEditorService extends Disposable {
-    constructor(contextKeyService, fileService, storageService, editorService, editorGroupService, instantiationService, uriIdentityService, editorResolverService) {
+    constructor(fileService, storageService, editorService, editorGroupService, instantiationService, uriIdentityService, editorResolverService) {
         super();
         this.editorService = editorService;
         this.editorGroupService = editorGroupService;
@@ -40,18 +40,26 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         this._onDidChangeEditorTypes = this._register(( new Emitter()));
         this.onDidChangeEditorTypes = this._onDidChangeEditorTypes.event;
         this._fileEditorFactory = ( Registry.as(EditorExtensions.EditorFactory)).getFileEditorFactory();
-        this._activeCustomEditorId = CONTEXT_ACTIVE_CUSTOM_EDITOR_ID.bindTo(contextKeyService);
-        this._focusedCustomEditorIsEditable = CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE.bindTo(contextKeyService);
         this._contributedEditors = this._register(( new ContributedCustomEditors(storageService)));
         this.editorResolverService.bufferChangeEvents(this.registerContributionPoints.bind(this));
         this._register(this._contributedEditors.onChange(() => {
             this.editorResolverService.bufferChangeEvents(this.registerContributionPoints.bind(this));
-            this.updateContexts();
             this._onDidChangeEditorTypes.fire();
         }));
-        this._register(this.editorService.onDidActiveEditorChange(() => this.updateContexts()));
+        const activeCustomEditorContextKeyProvider = {
+            contextKey: CONTEXT_ACTIVE_CUSTOM_EDITOR_ID,
+            getGroupContextKeyValue: group => this.getActiveCustomEditorId(group),
+            onDidChange: this.onDidChangeEditorTypes
+        };
+        const customEditorIsEditableContextKeyProvider = {
+            contextKey: CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE,
+            getGroupContextKeyValue: group => this.getCustomEditorIsEditable(group),
+            onDidChange: this.onDidChangeEditorTypes
+        };
+        this._register(this.editorGroupService.registerContextKeyProvider(activeCustomEditorContextKeyProvider));
+        this._register(this.editorGroupService.registerContextKeyProvider(customEditorIsEditableContextKeyProvider));
         this._register(fileService.onDidRunOperation(e => {
-            if (e.isOperation(2 )) {
+            if (e.isOperation(FileOperation.MOVE)) {
                 this.handleMovedFileInOpenedFileEditors(e.resource, this.uriIdentityService.asCanonicalUri(e.target.resource));
             }
         }));
@@ -62,7 +70,6 @@ let CustomEditorService = class CustomEditorService extends Disposable {
         this._register(RedoCommand.addImplementation(PRIORITY, 'custom-editor', () => {
             return this.withActiveCustomEditor(editor => editor.redo());
         }));
-        this.updateContexts();
     }
     getEditorTypes() {
         return [...this._contributedEditors];
@@ -143,16 +150,21 @@ let CustomEditorService = class CustomEditorService extends Disposable {
     getCustomEditorCapabilities(viewType) {
         return this._editorCapabilities.get(viewType);
     }
-    updateContexts() {
-        const activeEditorPane = this.editorService.activeEditorPane;
+    getActiveCustomEditorId(group) {
+        const activeEditorPane = group.activeEditorPane;
         const resource = activeEditorPane?.input?.resource;
         if (!resource) {
-            this._activeCustomEditorId.reset();
-            this._focusedCustomEditorIsEditable.reset();
-            return;
+            return '';
+        }
+        return activeEditorPane?.input instanceof CustomEditorInput ? activeEditorPane.input.viewType : '';
+    }
+    getCustomEditorIsEditable(group) {
+        const activeEditorPane = group.activeEditorPane;
+        const resource = activeEditorPane?.input?.resource;
+        if (!resource) {
+            return false;
         }
-        this._activeCustomEditorId.set(activeEditorPane?.input instanceof CustomEditorInput ? activeEditorPane.input.viewType : '');
-        this._focusedCustomEditorIsEditable.set(activeEditorPane?.input instanceof CustomEditorInput);
+        return activeEditorPane?.input instanceof CustomEditorInput;
     }
     async handleMovedFileInOpenedFileEditors(oldResource, newResource) {
         if (extname(oldResource).toLowerCase() === extname(newResource).toLowerCase()) {
@@ -202,14 +214,13 @@ let CustomEditorService = class CustomEditorService extends Disposable {
     }
 };
 CustomEditorService = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, IFileService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IEditorService)),
-    ( __param(4, IEditorGroupsService)),
-    ( __param(5, IInstantiationService)),
-    ( __param(6, IUriIdentityService)),
-    ( __param(7, IEditorResolverService))
+    ( __param(0, IFileService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, IEditorGroupsService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IUriIdentityService)),
+    ( __param(6, IEditorResolverService))
 ], CustomEditorService));
 
 export { CustomEditorService };

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -1,6 +1,7 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { CustomEditorInfo } from './customEditor.js';
 import { customEditorsExtensionPoint } from './extensionPoint.js';
@@ -16,7 +17,7 @@ class ContributedCustomEditors extends Disposable {
         this._onChange = this._register(( (new Emitter())));
         this.onChange = this._onChange.event;
         this._memento = ( (new Memento(ContributedCustomEditors.CUSTOM_EDITORS_STORAGE_ID, storageService)));
-        const mementoObject = this._memento.getMemento(0 , 1 );
+        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         for (const info of (mementoObject[ContributedCustomEditors.CUSTOM_EDITORS_ENTRY_ID] || [])) {
             this.add(( (new CustomEditorInfo(info))));
         }
@@ -37,7 +38,7 @@ class ContributedCustomEditors extends Disposable {
                 }))));
             }
         }
-        const mementoObject = this._memento.getMemento(0 , 1 );
+        const mementoObject = this._memento.getMemento(StorageScope.PROFILE, StorageTarget.MACHINE);
         mementoObject[ContributedCustomEditors.CUSTOM_EDITORS_ENTRY_ID] = Array.from(( (this._editors.values())));
         this._memento.saveMemento();
         this._onChange.fire();

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

@@ -9,6 +9,12 @@ const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( (new RawContextKey('activeCustomEditor
     description: ( localizeWithPath(_moduleId, 0, "The viewType of the currently active custom editor.")),
 })));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( (new RawContextKey('focusedCustomEditorIsEditable', false)));
+var CustomEditorPriority;
+( ((function(CustomEditorPriority) {
+    CustomEditorPriority["default"] = "default";
+    CustomEditorPriority["builtin"] = "builtin";
+    CustomEditorPriority["option"] = "option";
+})(CustomEditorPriority || (CustomEditorPriority = {}))));
 class CustomEditorInfo {
     constructor(descriptor) {
         this.id = descriptor.id;
@@ -52,4 +58,4 @@ function isLowerPriority(otherEditor, editor) {
     return priorityToRank(otherEditor.priority) < priorityToRank(editor.priority);
 }
 
-export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfo, CustomEditorInfoCollection };
+export { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorInfo, CustomEditorInfoCollection, CustomEditorPriority };

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -3,6 +3,7 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { CustomEditorPriority } from './customEditor.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { languagesExtPoint } from 'vscode/vscode/vs/workbench/services/language/common/languageService';
@@ -76,8 +77,8 @@ const CustomEditorsContribution = {
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
-                    "default" ,
-                    "option" ,
+                    CustomEditorPriority.default,
+                    CustomEditorPriority.option,
                 ],
                 markdownEnumDescriptions: [
                     ( localizeWithPath(

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js

@@ -1,4 +1,5 @@
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { externalUriOpenersConfigurationNode } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/languageStatus.css.js';
-import { getWindow, addDisposableListener, append } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, isHTMLElement, addDisposableListener, append } from 'vscode/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Disposable, DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
@@ -11,7 +11,8 @@ 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 { ShowTooltipCommand } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { ShowTooltipCommand, StatusbarAlignment } 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';
@@ -20,6 +21,7 @@ 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 +50,11 @@ let StoredCounter = class StoredCounter {
         this._key = _key;
     }
     get value() {
-        return this._storageService.getNumber(this._key, 0 , 0);
+        return this._storageService.getNumber(this._key, StorageScope.PROFILE, 0);
     }
     increment() {
         const n = this.value + 1;
-        this._storageService.store(this._key, n, 0 , 1 );
+        this._storageService.store(this._key, n, StorageScope.PROFILE, StorageTarget.MACHINE);
         return n;
     }
 };
@@ -62,7 +64,7 @@ StoredCounter = ( (__decorate([
 let LanguageStatusContribution = class LanguageStatusContribution extends Disposable {
     constructor(instantiationService, editorGroupService, editorService) {
         super();
-        const mainInstantiationService = instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))));
+        const mainInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])))));
         this._register(mainInstantiationService.createInstance(LanguageStatus));
         this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ instantiationService, disposables }) => {
             disposables.add(instantiationService.createInstance(LanguageStatus));
@@ -89,7 +91,7 @@ let LanguageStatus = class LanguageStatus {
         this._dedicated = ( (new Set()));
         this._dedicatedEntries = ( (new Map()));
         this._renderDisposables = ( (new DisposableStore()));
-        _storageService.onDidChangeValue(0 , LanguageStatus_1._keyDedicatedItems, this._disposables)(this._handleStorageChange, this, this._disposables);
+        _storageService.onDidChangeValue(StorageScope.PROFILE, 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);
@@ -114,7 +116,7 @@ let LanguageStatus = class LanguageStatus {
         this._update();
     }
     _restoreState() {
-        const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, 0 , '[]');
+        const raw = this._storageService.get(LanguageStatus_1._keyDedicatedItems, StorageScope.PROFILE, '[]');
         try {
             const ids = JSON.parse(raw);
             this._dedicated = ( (new Set(ids)));
@@ -125,11 +127,11 @@ let LanguageStatus = class LanguageStatus {
     }
     _storeState() {
         if (this._dedicated.size === 0) {
-            this._storageService.remove(LanguageStatus_1._keyDedicatedItems, 0 );
+            this._storageService.remove(LanguageStatus_1._keyDedicatedItems, StorageScope.PROFILE);
         }
         else {
             const raw = JSON.stringify(Array.from(( (this._dedicated.keys()))));
-            this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, 0 , 0 );
+            this._storageService.store(LanguageStatus_1._keyDedicatedItems, raw, StorageScope.PROFILE, StorageTarget.USER);
         }
     }
     _createViewModel(editor) {
@@ -185,7 +187,7 @@ let LanguageStatus = class LanguageStatus {
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
             };
             if (!this._combinedEntry) {
-                this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus_1._id, 1 , { id: 'status.editor.mode', alignment: 0 , compact: true });
+                this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus_1._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.LEFT, compact: true });
             }
             else {
                 this._combinedEntry.update(props);
@@ -194,7 +196,7 @@ let LanguageStatus = class LanguageStatus {
             const targetWindow = getWindow(editor?.getContainerDomNode());
             const node = targetWindow.document.querySelector('.monaco-workbench .statusbar DIV#status\\.languageStatus A>SPAN.codicon');
             const container = targetWindow.document.querySelector('.monaco-workbench .statusbar DIV#status\\.languageStatus');
-            if (node instanceof HTMLElement && container) {
+            if (isHTMLElement(node) && container) {
                 const _wiggle = 'wiggle';
                 const _flash = 'flash';
                 if (!isOneBusy) {
@@ -210,7 +212,7 @@ let LanguageStatus = class LanguageStatus {
             }
             if (!userHasInteractedWithStatus) {
                 const hoverTarget = targetWindow.document.querySelector('.monaco-workbench .context-view');
-                if (hoverTarget instanceof HTMLElement) {
+                if (isHTMLElement(hoverTarget)) {
                     const observer = ( (new MutationObserver(() => {
                         if (targetWindow.document.contains(element)) {
                             this._interactionCounter.increment();
@@ -227,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, 1 , { id: 'status.editor.mode', alignment: 1  });
+                entry = this._statusBarService.addEntry(props, status.id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT });
             }
             else {
                 entry.update(props);
@@ -363,7 +365,7 @@ LanguageStatus = LanguageStatus_1 = ( (__decorate([
     ( (__param(4, IOpenerService))),
     ( (__param(5, IStorageService)))
 ], LanguageStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LanguageStatusContribution, LifecyclePhase.Restored);
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -374,6 +376,6 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove('languageStatus.interactCount', 0 );
+        accessor.get(IStorageService).remove('languageStatus.interactCount', StorageScope.PROFILE);
     }
 });

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

@@ -6,6 +6,7 @@ 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 { localizeWithPath } 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';
@@ -112,6 +113,6 @@ class LanguageStatusEntry {
         this._indicatorChangeListener = undefined;
     }
 }
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LimitIndicatorContribution, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(LimitIndicatorContribution, LifecyclePhase.Restored);
 
 export { LimitIndicatorContribution };

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

@@ -6,6 +6,7 @@ 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';
@@ -502,7 +503,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         });
     }
     run(accessor) {
-        accessor.get(IStorageService).remove(StorageCloseWithConflicts, 0 );
+        accessor.get(IStorageService).remove(StorageCloseWithConflicts, StorageScope.PROFILE);
     }
 }
 class AcceptMerge extends MergeEditorAction2 {

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

@@ -4,12 +4,13 @@ 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 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } 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';
 
 const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution";
@@ -60,5 +61,5 @@ registerAction2(MergeEditorSaveContentsToFolder);
 registerAction2(MergeEditorLoadContentsFromFolder);
 ( (Registry
     .as(Extensions$1.Workbench)))
-    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, 3 );
-registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, 1 );
+    .registerWorkbenchContribution(MergeEditorOpenHandlerContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(MergeEditorResolverContribution.ID, MergeEditorResolverContribution, WorkbenchPhase.BlockStartup );

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

@@ -8,7 +8,7 @@ import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
-import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
 import { FixedZoneWidget } from './fixedZoneWidget.js';
@@ -19,7 +19,7 @@ class ConflictActionsFactory extends Disposable {
         super();
         this._editor = _editor;
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(50 ) || e.hasChanged(19 ) || e.hasChanged(18 )) {
+            if (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.codeLensFontSize) || e.hasChanged(EditorOption.codeLensFontFamily)) {
                 this._updateLensStyle();
             }
         }));
@@ -31,8 +31,8 @@ class ConflictActionsFactory extends Disposable {
     }
     _updateLensStyle() {
         const { codeLensHeight, fontSize } = this._getLayoutInfo();
-        const fontFamily = this._editor.getOption(18 );
-        const editorFontInfo = this._editor.getOption(50 );
+        const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
+        const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
         const fontFamilyVar = `--codelens-font-family${this._styleClassName}`;
         const fontFeaturesVar = `--codelens-font-features${this._styleClassName}`;
         let newStyle = `
@@ -47,10 +47,10 @@ class ConflictActionsFactory extends Disposable {
         this._editor.getContainerDomNode().style.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(67 ) / this._editor.getOption(52 ));
-        let fontSize = this._editor.getOption(19 );
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(EditorOption.lineHeight) / this._editor.getOption(EditorOption.fontSize));
+        let fontSize = this._editor.getOption(EditorOption.codeLensFontSize);
         if (!fontSize || fontSize < 5) {
-            fontSize = (this._editor.getOption(52 ) * .9) | 0;
+            fontSize = (this._editor.getOption(EditorOption.fontSize) * .9) | 0;
         }
         return {
             fontSize,

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

@@ -7,7 +7,7 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -88,7 +88,7 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: 2 ,
+                            position: MinimapPosition.Gutter,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {

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

@@ -15,7 +15,8 @@ import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/brows
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
-import { setStyle, observableConfigValue } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { setStyle } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 class CodeEditorView extends Disposable {
     updateOptions(newOptions) {

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

@@ -14,13 +14,14 @@ import 'vscode/vscode/vs/base/common/cancellation';
 import 'vscode/vscode/vs/base/common/arrays';
 import { noBreakWhitespace } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { InputState } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
 import { applyObservableDecorations, setFields } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
@@ -96,7 +97,7 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
                         blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                         description: 'Merge Editor',
                         minimap: {
-                            position: 2 ,
+                            position: MinimapPosition.Gutter,
                             color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                         },
                         overviewRuler: modifiedBaseRange.isConflicting ? {
@@ -193,8 +194,8 @@ class ModifiedBaseRangeGutterItemModel {
                 .getState(this.baseRange)
                 .read(reader)
                 .getInput(this.inputNumber);
-            return input === 2  && !this.baseRange.isOrderRelevant
-                ? 1
+            return input === InputState.second && !this.baseRange.isOrderRelevant
+                ? InputState.first
                 : input;
         });
         this.state = derived(this, reader => {
@@ -297,10 +298,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localizeWithPath(_moduleId, 6, "Accept")) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(_moduleId, 7, "Accept (result is dirty)")) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(_moduleId, 8, "Undo accept")) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(_moduleId, 9, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localizeWithPath(_moduleId, 6, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localizeWithPath(_moduleId, 7, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localizeWithPath(_moduleId, 8, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localizeWithPath(_moduleId, 9, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -9,7 +9,7 @@ import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived
 import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
-import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -71,7 +71,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                             blockIsAfterEnd: range.startLineNumber > textModel.getLineCount(),
                             description: 'Result Diff',
                             minimap: {
-                                position: 2 ,
+                                position: MinimapPosition.Gutter,
                                 color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
                             },
                             overviewRuler: modifiedBaseRange.isConflicting ? {

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { reset } from 'vscode/vscode/vs/base/browser/dom';
 import { SerializableGrid } from '../../../../../base/browser/ui/grid/grid.js';
+import 'vscode/vscode/vs/base/browser/ui/splitview/splitview';
 import { Color } from 'vscode/vscode/vs/base/common/color';
 import { BugIndicatingError, onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -15,12 +16,14 @@ import { isEqual, basename } from 'vscode/vscode/vs/base/common/resources';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import './media/mergeEditor.css.js';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
@@ -29,7 +32,8 @@ import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/ed
 import { applyTextEditorOptions } from 'vscode/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
 import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { observableConfigValue, PersistentStore, deepMerge, thenIfNotDisposed } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { PersistentStore, deepMerge, thenIfNotDisposed } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';
 import { MergeEditorViewModel } from './viewModel.js';
@@ -43,6 +47,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import './colors.js';
 import { InputCodeEditorView } from './editors/inputCodeEditorView.js';
 import { ResultCodeEditorView } from './editors/resultCodeEditorView.js';
+import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 import { AbstractTextEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textEditor';
 
 var MergeEditor_1, MergeEditorLayoutStore_1;
@@ -314,7 +319,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
     setOptions(options) {
         super.setOptions(options);
         if (options) {
-            applyTextEditorOptions(options, this.inputResultView.editor, 0 );
+            applyTextEditorOptions(options, this.inputResultView.editor, ScrollType.Smooth);
         }
     }
     clearInput() {
@@ -460,7 +465,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
             height = this._grid.value.height;
         }
         this._grid.value = SerializableGrid.from({
-            orientation: 0 ,
+            orientation: Orientation.VERTICAL,
             size: 100,
             groups: descriptor,
         }, {
@@ -529,7 +534,7 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     constructor(_storageService) {
         this._storageService = _storageService;
         this._value = { kind: 'mixed', showBase: false, showBaseAtTop: true };
-        const value = _storageService.get(MergeEditorLayoutStore_1._key, 0 , 'mixed');
+        const value = _storageService.get(MergeEditorLayoutStore_1._key, StorageScope.PROFILE, 'mixed');
         if (value === 'mixed' || value === 'columns') {
             this._value = { kind: value, showBase: false, showBaseAtTop: true };
         }
@@ -548,7 +553,7 @@ let MergeEditorLayoutStore = class MergeEditorLayoutStore {
     set value(value) {
         if (this._value !== value) {
             this._value = value;
-            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), 0 , 0 );
+            this._storageService.store(MergeEditorLayoutStore_1._key, JSON.stringify(this._value), StorageScope.PROFILE, StorageTarget.USER);
         }
     }
 };
@@ -570,7 +575,7 @@ let MergeEditorOpenHandlerContribution = class MergeEditorOpenHandlerContributio
             && activePane.input instanceof MergeEditorInput
             && isEqual(input.resource, activePane.input.result)) {
             const targetEditor = activePane.getControl();
-            applyTextEditorOptions(input.options, targetEditor, 0 );
+            applyTextEditorOptions(input.options, targetEditor, ScrollType.Smooth);
             return targetEditor;
         }
         return null;