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

package/vscode/src/vs/workbench/services/activity/browser/activityService.js

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity.service';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from 'vscode/vscode/vs/workbench/common/activity';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';

package/vscode/src/vs/workbench/services/editor/browser/editorPaneService.js

@@ -1,6 +1,5 @@
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 class EditorPaneService {
     constructor() {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isRelativePattern } from 'vscode/vscode/vs/base/common/glob';
-import { insert, distinct, firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { insert, distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { Disposable, toDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isEqual, extname, basename } from 'vscode/vscode/vs/base/common/resources';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -9,15 +9,13 @@ import { EditorResolution, EditorActivation } from 'vscode/vscode/vs/platform/ed
 import { isResourceSideBySideEditorInput, EditorResourceAccessor, SideBySideEditor, isEditorInputWithOptions, DEFAULT_EDITOR_ASSOCIATION, isResourceDiffEditorInput, isEditorInputWithOptionsAndGroup, isResourceMergeEditorInput, isResourceMultiDiffEditorInput, isUntitledResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { ResolvedStatus, globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { globMatchesResource, editorsAssociationsSettingId, RegisteredEditorPriority, priorityToRank } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { localize } from 'vscode/vscode/vs/nls';
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -49,9 +47,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         this._flattenedEditors = ( (new Map()));
         this._shouldReFlattenEditors = true;
         this.cache = ( (new Set(
-            JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, StorageScope.PROFILE, JSON.stringify([])))
+            JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, 0 , JSON.stringify([])))
         )));
-        this.storageService.remove(EditorResolverService_1.cacheStorageID, StorageScope.PROFILE);
+        this.storageService.remove(EditorResolverService_1.cacheStorageID, 0 );
         this._register(this.storageService.onWillSaveState(() => {
             this.cacheEditors();
         }));
@@ -84,7 +82,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             resolvedUntypedAndGroup = resolvedUntypedAndGroupResult;
         }
         if (!resolvedUntypedAndGroup) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         const [untypedEditor, group, activation] = resolvedUntypedAndGroup;
         if (activation) {
@@ -98,25 +96,25 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             resource = ( (URI.from({ scheme: Schemas.untitled })));
         }
         else if (resource.scheme === undefined || resource === null) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         if (untypedEditor.options?.override === EditorResolution.PICK) {
             const picked = await this.doPickEditor(untypedEditor);
             if (!picked) {
-                return ResolvedStatus.ABORT;
+                return 1 ;
             }
             untypedEditor.options = picked;
         }
         let { editor: selectedEditor, conflictingDefault } = this.getEditor(resource, untypedEditor.options?.override);
         if (!selectedEditor && (untypedEditor.options?.override || isEditorInputWithOptions(editor))) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         else if (!selectedEditor) {
             const resolvedEditor = this.getEditor(resource, DEFAULT_EDITOR_ASSOCIATION.id);
             selectedEditor = resolvedEditor?.editor;
             conflictingDefault = resolvedEditor?.conflictingDefault;
             if (!selectedEditor) {
-                return ResolvedStatus.NONE;
+                return 2 ;
             }
         }
         if (isResourceDiffEditorInput(untypedEditor) && untypedEditor.options?.override === undefined) {
@@ -131,12 +129,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 conflictingDefault = conflictingDefaultDiff;
             }
             if (!selectedEditor) {
-                return ResolvedStatus.NONE;
+                return 2 ;
             }
         }
         untypedEditor.options = { override: selectedEditor.editorInfo.id, ...untypedEditor.options };
         if (selectedEditor.editorFactoryObject.createDiffEditorInput === undefined && isResourceDiffEditorInput(untypedEditor)) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         const input = await this.doResolveEditor(untypedEditor, group, selectedEditor);
         if (conflictingDefault && input) {
@@ -149,16 +147,16 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
             return { ...input, group };
         }
-        return ResolvedStatus.ABORT;
+        return 1 ;
     }
     async doResolveSideBySideEditor(editor, preferredGroup) {
         const primaryResolvedEditor = await this.resolveEditor(editor.primary, preferredGroup);
         if (!isEditorInputWithOptionsAndGroup(primaryResolvedEditor)) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         const secondaryResolvedEditor = await this.resolveEditor(editor.secondary, primaryResolvedEditor.group ?? preferredGroup);
         if (!isEditorInputWithOptionsAndGroup(secondaryResolvedEditor)) {
-            return ResolvedStatus.NONE;
+            return 2 ;
         }
         return {
             group: primaryResolvedEditor.group ?? secondaryResolvedEditor.group,
@@ -440,18 +438,18 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     async doHandleConflictingDefaults(resource, editorName, untypedInput, currentEditor, group) {
         const editors = this.findMatchingEditors(resource);
-        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService_1.conflictingDefaultsStorageID, StorageScope.PROFILE, '{}'));
+        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService_1.conflictingDefaultsStorageID, 0 , '{}'));
         const globForResource = `*${extname(resource)}`;
         const writeCurrentEditorsToStorage = () => {
             storedChoices[globForResource] = [];
             editors.forEach(editor => storedChoices[globForResource].push(editor.editorInfo.id));
-            this.storageService.store(EditorResolverService_1.conflictingDefaultsStorageID, JSON.stringify(storedChoices), StorageScope.PROFILE, StorageTarget.MACHINE);
+            this.storageService.store(EditorResolverService_1.conflictingDefaultsStorageID, JSON.stringify(storedChoices), 0 , 1 );
         };
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4042, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(4043, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4151, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(4152, 'Configure Default')),
                 run: async () => {
                     const picked = await this.doPickEditor(untypedInput, true);
                     if (!picked) {
@@ -459,7 +457,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                     }
                     untypedInput.options = picked;
                     const replacementEditor = await this.resolveEditor(untypedInput, group);
-                    if (replacementEditor === ResolvedStatus.ABORT || replacementEditor === ResolvedStatus.NONE) {
+                    if (replacementEditor === 1  || replacementEditor === 2 ) {
                         return;
                     }
                     group.replaceEditors([
@@ -472,7 +470,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }
             },
             {
-                label: ( localize(4044, 'Keep {0}', editorName)),
+                label: ( localize(4153, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -482,7 +480,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         });
     }
     mapEditorsToQuickPickEntry(resource, showDefaultPicker) {
-        const currentEditor = firstOrDefault(this.editorGroupService.activeGroup.findEditors(resource));
+        const currentEditor = this.editorGroupService.activeGroup.findEditors(resource).at(0);
         let registeredEditors = resource.scheme === Schemas.untitled ? this._registeredEditors.filter(e => e.editorInfo.priority !== RegisteredEditorPriority.exclusive) : this.findMatchingEditors(resource);
         registeredEditors = distinct(registeredEditors, c => c.editorInfo.id);
         const defaultSetting = this.getAssociationsForResource(resource)[0]?.viewType;
@@ -498,9 +496,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(4045, "Active"));
-        const currentDefaultLabel = ( localize(4046, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(4047, "Active and Default"));
+        const currentlyActiveLabel = ( localize(4154, "Active"));
+        const currentDefaultLabel = ( localize(4155, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(4156, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -525,7 +523,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(4048, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(4157, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -540,8 +538,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const disposables = ( (new DisposableStore()));
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         const placeHolderMessage = showDefaultPicker ?
-            ( localize(4049, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(4050, "Select editor for '{0}'", basename(resource)));
+            ( localize(4158, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(4159, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;
@@ -615,7 +613,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 cacheStorage.add(association.filenamePattern);
             }
         }
-        this.storageService.store(EditorResolverService_1.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), StorageScope.PROFILE, StorageTarget.MACHINE);
+        this.storageService.store(EditorResolverService_1.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), 0 , 1 );
     }
     resourceMatchesCache(resource) {
         if (!this.cache) {

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -1,15 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { GroupModelChangeKind, isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorsOrder, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason } from 'vscode/vscode/vs/workbench/common/editor';
+import { isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { GoScope, GoFilter } from 'vscode/vscode/vs/workbench/services/history/common/history';
 import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history.service';
-import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperation, FileOperationEvent, FileChangeType } from 'vscode/vscode/vs/platform/files/common/files';
+import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperationEvent } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -20,7 +18,7 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { coalesce, remove } from 'vscode/vscode/vs/base/common/arrays';
-import { registerSingleton, InstantiationType } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { registerSingleton } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { WindowIdleValue, addDisposableListener, EventType, EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { IWorkspacesService } from 'vscode/vscode/vs/platform/workspaces/common/workspaces.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -28,7 +26,6 @@ import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
 import { ResourceGlobMatcher } from 'vscode/vscode/vs/workbench/common/resources';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { LogLevel } from 'vscode/vscode/vs/platform/log/common/log';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -55,39 +52,39 @@ let HistoryService = class HistoryService extends Disposable {
         this.activeEditorListeners = this._register(( (new DisposableStore())));
         this.lastActiveEditor = undefined;
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(4092, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(4093, "Whether it is possible to navigate forward in editor history")))))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = (( (new RawContextKey('canNavigateBack', false, ( localize(4201, "Whether it is possible to navigate back in editor history")))))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = (( (new RawContextKey('canNavigateForward', false, ( localize(4202, "Whether it is possible to navigate forward in editor history")))))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = (( (new RawContextKey('canNavigateBackInNavigationLocations', false, ( localize(
-            4094,
+            4203,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = (( (new RawContextKey('canNavigateForwardInNavigationLocations', false, ( localize(
-            4095,
+            4204,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = (( (new RawContextKey('canNavigateToLastNavigationLocation', false, ( localize(
-            4096,
+            4205,
             "Whether it is possible to navigate to the last editor navigation location"
         )))))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = (( (new RawContextKey('canNavigateBackInEditLocations', false, ( localize(
-            4097,
+            4206,
             "Whether it is possible to navigate back in editor edit locations history"
         )))))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = (( (new RawContextKey('canNavigateForwardInEditLocations', false, ( localize(
-            4098,
+            4207,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = (( (new RawContextKey('canNavigateToLastEditLocation', false, ( localize(
-            4099,
+            4208,
             "Whether it is possible to navigate to the last editor edit location"
         )))))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(4100, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = (( (new RawContextKey('canReopenClosedEditor', false, ( localize(4209, "Whether it is possible to reopen the last closed editor")))))).bindTo(this.contextKeyService);
         this._onDidChangeEditorNavigationStack = this._register(( (new Emitter())));
         this.onDidChangeEditorNavigationStack = this._onDidChangeEditorNavigationStack.event;
         this.defaultScopedEditorNavigationStack = undefined;
         this.editorGroupScopedNavigationStacks = ( (new Map()));
         this.editorScopedNavigationStacks = ( (new Map()));
-        this.editorNavigationScope = GoScope.DEFAULT;
+        this.editorNavigationScope = 0 ;
         this.recentlyUsedEditorsStack = undefined;
         this.recentlyUsedEditorsStackIndex = 0;
         this.recentlyUsedEditorsInGroupStack = undefined;
@@ -179,7 +176,7 @@ let HistoryService = class HistoryService extends Disposable {
         else {
             this.logService.trace(`[History]: ignoring transient editor change until becoming non-transient (editor: ${activeEditorPane.input?.resource?.toString()}})`);
             const transientListener = activeEditorGroup.onDidModelChange(e => {
-                if (e.kind === GroupModelChangeKind.EDITOR_TRANSIENT && e.editor === activeEditorPane.input && !activeEditorPane.group.isTransient(activeEditorPane.input)) {
+                if (e.kind === 12  && e.editor === activeEditorPane.input && !activeEditorPane.group.isTransient(activeEditorPane.input)) {
                     transientListener.dispose();
                     this.handleActiveEditorChange(activeEditorGroup, activeEditorPane);
                 }
@@ -205,10 +202,10 @@ let HistoryService = class HistoryService extends Disposable {
             }
         }
         else {
-            if (event.isOperation(FileOperation.DELETE)) {
+            if (event.isOperation(1 )) {
                 this.remove(event);
             }
-            else if (event.isOperation(FileOperation.MOVE) && event.target.isFile) {
+            else if (event.isOperation(2 ) && event.target.isFile) {
                 this.move(event);
             }
         }
@@ -252,14 +249,14 @@ let HistoryService = class HistoryService extends Disposable {
     updateContextKeys() {
         this.contextKeyService.bufferChangeEvents(() => {
             const activeStack = this.getStack();
-            this.canNavigateBackContextKey.set(activeStack.canGoBack(GoFilter.NONE));
-            this.canNavigateForwardContextKey.set(activeStack.canGoForward(GoFilter.NONE));
-            this.canNavigateBackInNavigationsContextKey.set(activeStack.canGoBack(GoFilter.NAVIGATION));
-            this.canNavigateForwardInNavigationsContextKey.set(activeStack.canGoForward(GoFilter.NAVIGATION));
-            this.canNavigateToLastNavigationLocationContextKey.set(activeStack.canGoLast(GoFilter.NAVIGATION));
-            this.canNavigateBackInEditsContextKey.set(activeStack.canGoBack(GoFilter.EDITS));
-            this.canNavigateForwardInEditsContextKey.set(activeStack.canGoForward(GoFilter.EDITS));
-            this.canNavigateToLastEditLocationContextKey.set(activeStack.canGoLast(GoFilter.EDITS));
+            this.canNavigateBackContextKey.set(activeStack.canGoBack(0 ));
+            this.canNavigateForwardContextKey.set(activeStack.canGoForward(0 ));
+            this.canNavigateBackInNavigationsContextKey.set(activeStack.canGoBack(2 ));
+            this.canNavigateForwardInNavigationsContextKey.set(activeStack.canGoForward(2 ));
+            this.canNavigateToLastNavigationLocationContextKey.set(activeStack.canGoLast(2 ));
+            this.canNavigateBackInEditsContextKey.set(activeStack.canGoBack(1 ));
+            this.canNavigateForwardInEditsContextKey.set(activeStack.canGoForward(1 ));
+            this.canNavigateToLastEditLocationContextKey.set(activeStack.canGoLast(1 ));
             this.canReopenClosedEditorContextKey.set(this.recentlyClosedEditors.length > 0);
         });
     }
@@ -268,13 +265,13 @@ let HistoryService = class HistoryService extends Disposable {
             this.disposeEditorNavigationStacks();
             const configuredScope = this.configurationService.getValue(HistoryService_1.NAVIGATION_SCOPE_SETTING);
             if (configuredScope === 'editorGroup') {
-                this.editorNavigationScope = GoScope.EDITOR_GROUP;
+                this.editorNavigationScope = 1 ;
             }
             else if (configuredScope === 'editor') {
-                this.editorNavigationScope = GoScope.EDITOR;
+                this.editorNavigationScope = 2 ;
             }
             else {
-                this.editorNavigationScope = GoScope.DEFAULT;
+                this.editorNavigationScope = 0 ;
             }
         };
         this._register(this.configurationService.onDidChangeConfiguration(event => {
@@ -286,7 +283,7 @@ let HistoryService = class HistoryService extends Disposable {
     }
     getStack(group = this.editorGroupService.activeGroup, editor = group.activeEditor) {
         switch (this.editorNavigationScope) {
-            case GoScope.EDITOR: {
+            case 2 : {
                 if (!editor) {
                     return (
                          (new NoOpEditorNavigationStacks())
@@ -300,25 +297,25 @@ let HistoryService = class HistoryService extends Disposable {
                 let stack = stacksForGroup.get(editor)?.stack;
                 if (!stack) {
                     const disposable = ( (new DisposableStore()));
-                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.EDITOR));
+                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 2 ));
                     disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                     stacksForGroup.set(editor, { stack, disposable });
                 }
                 return stack;
             }
-            case GoScope.EDITOR_GROUP: {
+            case 1 : {
                 let stack = this.editorGroupScopedNavigationStacks.get(group.id)?.stack;
                 if (!stack) {
                     const disposable = ( (new DisposableStore()));
-                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.EDITOR_GROUP));
+                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 1 ));
                     disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                     this.editorGroupScopedNavigationStacks.set(group.id, { stack, disposable });
                 }
                 return stack;
             }
-            case GoScope.DEFAULT: {
+            case 0 : {
                 if (!this.defaultScopedEditorNavigationStack) {
-                    this.defaultScopedEditorNavigationStack = this._register(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.DEFAULT));
+                    this.defaultScopedEditorNavigationStack = this._register(this.instantiationService.createInstance(EditorNavigationStacks, 0 ));
                     this._register(this.defaultScopedEditorNavigationStack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                 }
                 return this.defaultScopedEditorNavigationStack;
@@ -436,11 +433,11 @@ let HistoryService = class HistoryService extends Disposable {
         let index;
         const group = typeof groupId === 'number' ? this.editorGroupService.getGroup(groupId) : undefined;
         if (!group) {
-            editors = this.recentlyUsedEditorsStack || this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
+            editors = this.recentlyUsedEditorsStack || this.editorService.getEditors(0 );
             index = this.recentlyUsedEditorsStackIndex;
         }
         else {
-            editors = this.recentlyUsedEditorsInGroupStack || ( (group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map(editor => ({ groupId: group.id, editor }))));
+            editors = this.recentlyUsedEditorsInGroupStack || ( (group.getEditors(0 ).map(editor => ({ groupId: group.id, editor }))));
             index = this.recentlyUsedEditorsInGroupStackIndex;
         }
         let newIndex = indexModifier(index);
@@ -627,7 +624,7 @@ let HistoryService = class HistoryService extends Disposable {
         });
     }
     moveInHistory(event) {
-        if (event.isOperation(FileOperation.MOVE)) {
+        if (event.isOperation(2 )) {
             const removed = this.removeFromHistory(event);
             if (removed) {
                 this.addToHistory({ resource: event.target.resource });
@@ -696,7 +693,7 @@ let HistoryService = class HistoryService extends Disposable {
     loadHistory() {
         this.history = [];
         const storedEditorHistory = this.loadHistoryFromStorage();
-        const openedEditorsLru = [...this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)].reverse();
+        const openedEditorsLru = [...this.editorService.getEditors(0 )].reverse();
         const handledEditors = ( (new Set()));
         for (const { editor } of openedEditorsLru) {
             if (!this.includeInHistory(editor)) {
@@ -718,7 +715,7 @@ let HistoryService = class HistoryService extends Disposable {
     }
     loadHistoryFromStorage() {
         const entries = [];
-        const entriesRaw = this.storageService.get(HistoryService_1.HISTORY_STORAGE_KEY, StorageScope.WORKSPACE);
+        const entriesRaw = this.storageService.get(HistoryService_1.HISTORY_STORAGE_KEY, 1 );
         if (entriesRaw) {
             try {
                 const entriesParsed = JSON.parse(entriesRaw);
@@ -762,7 +759,7 @@ let HistoryService = class HistoryService extends Disposable {
                 }
             });
         }
-        this.storageService.store(HistoryService_1.HISTORY_STORAGE_KEY, JSON.stringify(entries), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+        this.storageService.store(HistoryService_1.HISTORY_STORAGE_KEY, JSON.stringify(entries), 1 , 1 );
     }
     getLastActiveWorkspaceRoot(schemeFilter, authorityFilter) {
         const folders = this.contextService.getWorkspace().folders;
@@ -842,7 +839,7 @@ HistoryService = HistoryService_1 = ( (__decorate([
     ( (__param(9, IContextKeyService))),
     ( (__param(10, ILogService)))
 ], HistoryService)));
-( (registerSingleton(IHistoryService, HistoryService, InstantiationType.Eager)));
+( (registerSingleton(IHistoryService, HistoryService, 0 )));
 class EditorSelectionState {
     constructor(editorIdentifier, selection, reason) {
         this.editorIdentifier = editorIdentifier;
@@ -860,10 +857,10 @@ class EditorSelectionState {
             return true;
         }
         const result = this.selection.compare(other.selection);
-        if (result === EditorPaneSelectionCompareResult.SIMILAR && (other.reason === EditorPaneSelectionChangeReason.NAVIGATION || other.reason === EditorPaneSelectionChangeReason.JUMP)) {
+        if (result === 2  && ((other.reason === 4  || other.reason === 5) )) {
             return true;
         }
-        return result === EditorPaneSelectionCompareResult.DIFFERENT;
+        return result === 3 ;
     }
 }
 let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
@@ -871,9 +868,9 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
         super();
         this.scope = scope;
         this.instantiationService = instantiationService;
-        this.selectionsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NONE, this.scope));
-        this.editsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.EDITS, this.scope));
-        this.navigationsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NAVIGATION, this.scope));
+        this.selectionsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, 0 , this.scope));
+        this.editsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, 1 , this.scope));
+        this.navigationsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, 2 , this.scope));
         this.stacks = [
             this.selectionsStack,
             this.editsStack,
@@ -902,11 +899,11 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
     goLast(filter) {
         return this.getStack(filter).goLast();
     }
-    getStack(filter = GoFilter.NONE) {
+    getStack(filter = 0 ) {
         switch (filter) {
-            case GoFilter.NONE: return this.selectionsStack;
-            case GoFilter.EDITS: return this.editsStack;
-            case GoFilter.NAVIGATION: return this.navigationsStack;
+            case 0 : return this.selectionsStack;
+            case 1 : return this.editsStack;
+            case 2 : return this.navigationsStack;
         }
     }
     handleActiveEditorChange(editorPane) {
@@ -915,12 +912,12 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
     handleActiveEditorSelectionChange(editorPane, event) {
         const previous = this.selectionsStack.current;
         this.selectionsStack.notifyNavigation(editorPane, event);
-        if (event.reason === EditorPaneSelectionChangeReason.EDIT) {
+        if (event.reason === 3 ) {
             this.editsStack.notifyNavigation(editorPane, event);
         }
-        else if ((event.reason === EditorPaneSelectionChangeReason.NAVIGATION || event.reason === EditorPaneSelectionChangeReason.JUMP) &&
+        else if (((event.reason === 4  || event.reason === 5) ) &&
             !this.selectionsStack.isNavigating()) {
-            if (event.reason === EditorPaneSelectionChangeReason.JUMP && !this.navigationsStack.isNavigating()) {
+            if (event.reason === 5  && !this.navigationsStack.isNavigating()) {
                 if (previous) {
                     this.navigationsStack.addOrReplace(previous.groupId, previous.editor, previous.selection);
                 }
@@ -1028,25 +1025,25 @@ ${entryLabels.join('\n')}
         }
         let filterLabel;
         switch (this.filter) {
-            case GoFilter.NONE:
+            case 0 :
                 filterLabel = 'global';
                 break;
-            case GoFilter.EDITS:
+            case 1 :
                 filterLabel = 'edits';
                 break;
-            case GoFilter.NAVIGATION:
+            case 2 :
                 filterLabel = 'navigation';
                 break;
         }
         let scopeLabel;
         switch (this.scope) {
-            case GoScope.DEFAULT:
+            case 0 :
                 scopeLabel = 'default';
                 break;
-            case GoScope.EDITOR_GROUP:
+            case 1 :
                 scopeLabel = 'editorGroup';
                 break;
-            case GoScope.EDITOR:
+            case 2 :
                 scopeLabel = 'editor';
                 break;
         }
@@ -1062,11 +1059,11 @@ ${entryLabels.join('\n')}
             return '<none>';
         }
         switch (event.reason) {
-            case EditorPaneSelectionChangeReason.EDIT: return 'edit';
-            case EditorPaneSelectionChangeReason.NAVIGATION: return 'navigation';
-            case EditorPaneSelectionChangeReason.JUMP: return 'jump';
-            case EditorPaneSelectionChangeReason.PROGRAMMATIC: return 'programmatic';
-            case EditorPaneSelectionChangeReason.USER: return 'user';
+            case 3 : return 'edit';
+            case 4 : return 'navigation';
+            case 5 : return 'jump';
+            case 1 : return 'programmatic';
+            case 2 : return 'user';
         }
     }
     registerGroupListeners(groupId) {
@@ -1079,7 +1076,7 @@ ${entryLabels.join('\n')}
     }
     onWillMoveEditor(e) {
         this.trace('onWillMoveEditor()', e.editor);
-        if (this.scope === GoScope.EDITOR_GROUP) {
+        if (this.scope === 1 ) {
             return;
         }
         for (const entry of this.stack) {
@@ -1223,10 +1220,10 @@ ${entryLabels.join('\n')}
         if (!candidate.selection) {
             return false;
         }
-        return entry.selection.compare(candidate.selection) === EditorPaneSelectionCompareResult.IDENTICAL;
+        return entry.selection.compare(candidate.selection) === 1 ;
     }
     move(event) {
-        if (event.isOperation(FileOperation.MOVE)) {
+        if (event.isOperation(2 )) {
             for (const entry of this.stack) {
                 if (this.editorHelper.matchesEditor(event, entry.editor)) {
                     entry.editor = { resource: event.target.resource };
@@ -1334,7 +1331,7 @@ ${entryLabels.join('\n')}
         return this.navigate();
     }
     async maybeGoCurrent() {
-        if (this.filter === GoFilter.NONE) {
+        if (this.filter === 0 ) {
             return false;
         }
         if (this.isCurrentSelectionActive()) {
@@ -1361,7 +1358,7 @@ ${entryLabels.join('\n')}
         if (!paneSelection) {
             return false;
         }
-        return paneSelection.compare(this.current.selection) === EditorPaneSelectionCompareResult.IDENTICAL;
+        return paneSelection.compare(this.current.selection) === 1 ;
     }
     setIndex(newIndex, skipEvent) {
         this.previousIndex = this.index;
@@ -1439,7 +1436,7 @@ let EditorHelper = class EditorHelper {
                 return false;
             }
             if (arg1 instanceof FileChangesEvent) {
-                return arg1.contains(inputB.resource, FileChangeType.DELETED);
+                return arg1.contains(inputB.resource, 2 );
             }
             return this.matchesFile(inputB.resource, arg1);
         }
@@ -1456,7 +1453,7 @@ let EditorHelper = class EditorHelper {
     }
     matchesFile(resource, arg2) {
         if (arg2 instanceof FileChangesEvent) {
-            return arg2.contains(resource, FileChangeType.DELETED);
+            return arg2.contains(resource, 2 );
         }
         if (arg2 instanceof FileOperationEvent) {
             return this.uriIdentityService.extUri.isEqualOrParent(resource, arg2.resource);
@@ -1466,7 +1463,7 @@ let EditorHelper = class EditorHelper {
             if (!inputResource) {
                 return false;
             }
-            if (this.lifecycleService.phase >= LifecyclePhase.Restored && !this.fileService.hasProvider(inputResource)) {
+            if (this.lifecycleService.phase >= 3  && !this.fileService.hasProvider(inputResource)) {
                 return false;
             }
             return this.uriIdentityService.extUri.isEqual(inputResource, resource);