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

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

@@ -1,13 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
+import { GroupModelChangeKind, isEditorPaneWithSelection, isEditorInput, EditorResourceAccessor, EditorsOrder, EditorCloseContext, SideBySideEditor, isSideBySideEditorInput, isResourceEditorInput, EditorPaneSelectionCompareResult, EditorPaneSelectionChangeReason } 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, FileOperationEvent } from 'vscode/vscode/vs/platform/files/common/files';
+import { FILES_EXCLUDE_CONFIG, FileChangesEvent, FileOperation, FileOperationEvent, FileChangeType } 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';
@@ -18,7 +20,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 } from 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { registerSingleton, InstantiationType } 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';
@@ -26,6 +28,7 @@ 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';
@@ -95,7 +98,7 @@ let HistoryService = class HistoryService extends Disposable {
         this.defaultScopedEditorNavigationStack = undefined;
         this.editorGroupScopedNavigationStacks = ( (new Map()));
         this.editorScopedNavigationStacks = ( (new Map()));
-        this.editorNavigationScope = 0 ;
+        this.editorNavigationScope = GoScope.DEFAULT;
         this.recentlyUsedEditorsStack = undefined;
         this.recentlyUsedEditorsStackIndex = 0;
         this.recentlyUsedEditorsInGroupStack = undefined;
@@ -185,7 +188,14 @@ let HistoryService = class HistoryService extends Disposable {
             this.handleActiveEditorChange(activeEditorGroup, activeEditorPane);
         }
         else {
-            this.logService.trace(`[History]: ignoring transient editor change (editor: ${activeEditorPane.input?.resource?.toString()}})`);
+            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)) {
+                    transientListener.dispose();
+                    this.handleActiveEditorChange(activeEditorGroup, activeEditorPane);
+                }
+            });
+            this.activeEditorListeners.add(transientListener);
         }
         if (isEditorPaneWithSelection(activeEditorPane)) {
             this.activeEditorListeners.add(activeEditorPane.onDidChangeSelection(e => {
@@ -206,10 +216,10 @@ let HistoryService = class HistoryService extends Disposable {
             }
         }
         else {
-            if (event.isOperation(1 )) {
+            if (event.isOperation(FileOperation.DELETE)) {
                 this.remove(event);
             }
-            else if (event.isOperation(2 ) && event.target.isFile) {
+            else if (event.isOperation(FileOperation.MOVE) && event.target.isFile) {
                 this.move(event);
             }
         }
@@ -253,14 +263,14 @@ let HistoryService = class HistoryService extends Disposable {
     updateContextKeys() {
         this.contextKeyService.bufferChangeEvents(() => {
             const activeStack = this.getStack();
-            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.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.canReopenClosedEditorContextKey.set(this.recentlyClosedEditors.length > 0);
         });
     }
@@ -269,13 +279,13 @@ let HistoryService = class HistoryService extends Disposable {
             this.disposeEditorNavigationStacks();
             const configuredScope = this.configurationService.getValue(HistoryService_1.NAVIGATION_SCOPE_SETTING);
             if (configuredScope === 'editorGroup') {
-                this.editorNavigationScope = 1 ;
+                this.editorNavigationScope = GoScope.EDITOR_GROUP;
             }
             else if (configuredScope === 'editor') {
-                this.editorNavigationScope = 2 ;
+                this.editorNavigationScope = GoScope.EDITOR;
             }
             else {
-                this.editorNavigationScope = 0 ;
+                this.editorNavigationScope = GoScope.DEFAULT;
             }
         };
         this._register(this.configurationService.onDidChangeConfiguration(event => {
@@ -287,7 +297,7 @@ let HistoryService = class HistoryService extends Disposable {
     }
     getStack(group = this.editorGroupService.activeGroup, editor = group.activeEditor) {
         switch (this.editorNavigationScope) {
-            case 2 : {
+            case GoScope.EDITOR: {
                 if (!editor) {
                     return (
                          (new NoOpEditorNavigationStacks())
@@ -301,25 +311,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, 2 ));
+                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.EDITOR));
                     disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                     stacksForGroup.set(editor, { stack, disposable });
                 }
                 return stack;
             }
-            case 1 : {
+            case GoScope.EDITOR_GROUP: {
                 let stack = this.editorGroupScopedNavigationStacks.get(group.id)?.stack;
                 if (!stack) {
                     const disposable = ( (new DisposableStore()));
-                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, 1 ));
+                    stack = disposable.add(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.EDITOR_GROUP));
                     disposable.add(stack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                     this.editorGroupScopedNavigationStacks.set(group.id, { stack, disposable });
                 }
                 return stack;
             }
-            case 0 : {
+            case GoScope.DEFAULT: {
                 if (!this.defaultScopedEditorNavigationStack) {
-                    this.defaultScopedEditorNavigationStack = this._register(this.instantiationService.createInstance(EditorNavigationStacks, 0 ));
+                    this.defaultScopedEditorNavigationStack = this._register(this.instantiationService.createInstance(EditorNavigationStacks, GoScope.DEFAULT));
                     this._register(this.defaultScopedEditorNavigationStack.onDidChange(() => this._onDidChangeEditorNavigationStack.fire()));
                 }
                 return this.defaultScopedEditorNavigationStack;
@@ -437,11 +447,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(0 );
+            editors = this.recentlyUsedEditorsStack || this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
             index = this.recentlyUsedEditorsStackIndex;
         }
         else {
-            editors = this.recentlyUsedEditorsInGroupStack || ( (group.getEditors(0 ).map(editor => ({ groupId: group.id, editor }))));
+            editors = this.recentlyUsedEditorsInGroupStack || ( (group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).map(editor => ({ groupId: group.id, editor }))));
             index = this.recentlyUsedEditorsInGroupStackIndex;
         }
         let newIndex = indexModifier(index);
@@ -598,7 +608,7 @@ let HistoryService = class HistoryService extends Disposable {
                 const sideInputs = editor.primary.matches(editor.secondary) ? [editor.primary] : [editor.primary, editor.secondary];
                 for (const sideInput of sideInputs) {
                     const candidateResourceInput = this.editorHelper.preferResourceEditorInput(sideInput);
-                    if (isResourceEditorInput(candidateResourceInput)) {
+                    if (isResourceEditorInput(candidateResourceInput) && this.includeInHistory(candidateResourceInput)) {
                         resourceInputs.push(candidateResourceInput);
                     }
                 }
@@ -628,7 +638,7 @@ let HistoryService = class HistoryService extends Disposable {
         });
     }
     moveInHistory(event) {
-        if (event.isOperation(2 )) {
+        if (event.isOperation(FileOperation.MOVE)) {
             const removed = this.removeFromHistory(event);
             if (removed) {
                 this.addToHistory({ resource: event.target.resource });
@@ -697,7 +707,7 @@ let HistoryService = class HistoryService extends Disposable {
     loadHistory() {
         this.history = [];
         const storedEditorHistory = this.loadHistoryFromStorage();
-        const openedEditorsLru = [...this.editorService.getEditors(0 )].reverse();
+        const openedEditorsLru = [...this.editorService.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)].reverse();
         const handledEditors = ( (new Set()));
         for (const { editor } of openedEditorsLru) {
             if (!this.includeInHistory(editor)) {
@@ -719,7 +729,7 @@ let HistoryService = class HistoryService extends Disposable {
     }
     loadHistoryFromStorage() {
         const entries = [];
-        const entriesRaw = this.storageService.get(HistoryService_1.HISTORY_STORAGE_KEY, 1 );
+        const entriesRaw = this.storageService.get(HistoryService_1.HISTORY_STORAGE_KEY, StorageScope.WORKSPACE);
         if (entriesRaw) {
             try {
                 const entriesParsed = JSON.parse(entriesRaw);
@@ -763,7 +773,7 @@ let HistoryService = class HistoryService extends Disposable {
                 }
             });
         }
-        this.storageService.store(HistoryService_1.HISTORY_STORAGE_KEY, JSON.stringify(entries), 1 , 1 );
+        this.storageService.store(HistoryService_1.HISTORY_STORAGE_KEY, JSON.stringify(entries), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     }
     getLastActiveWorkspaceRoot(schemeFilter, authorityFilter) {
         const folders = this.contextService.getWorkspace().folders;
@@ -843,7 +853,7 @@ HistoryService = HistoryService_1 = ( (__decorate([
     ( (__param(9, IContextKeyService))),
     ( (__param(10, ILogService)))
 ], HistoryService)));
-( (registerSingleton(IHistoryService, HistoryService, 0 )));
+( (registerSingleton(IHistoryService, HistoryService, InstantiationType.Eager)));
 class EditorSelectionState {
     constructor(editorIdentifier, selection, reason) {
         this.editorIdentifier = editorIdentifier;
@@ -861,10 +871,10 @@ class EditorSelectionState {
             return true;
         }
         const result = this.selection.compare(other.selection);
-        if (result === 2  && ((other.reason === 4  || other.reason === 5) )) {
+        if (result === EditorPaneSelectionCompareResult.SIMILAR && (other.reason === EditorPaneSelectionChangeReason.NAVIGATION || other.reason === EditorPaneSelectionChangeReason.JUMP)) {
             return true;
         }
-        return result === 3 ;
+        return result === EditorPaneSelectionCompareResult.DIFFERENT;
     }
 }
 let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
@@ -872,9 +882,9 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
         super();
         this.scope = scope;
         this.instantiationService = instantiationService;
-        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.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.stacks = [
             this.selectionsStack,
             this.editsStack,
@@ -903,11 +913,11 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
     goLast(filter) {
         return this.getStack(filter).goLast();
     }
-    getStack(filter = 0 ) {
+    getStack(filter = GoFilter.NONE) {
         switch (filter) {
-            case 0 : return this.selectionsStack;
-            case 1 : return this.editsStack;
-            case 2 : return this.navigationsStack;
+            case GoFilter.NONE: return this.selectionsStack;
+            case GoFilter.EDITS: return this.editsStack;
+            case GoFilter.NAVIGATION: return this.navigationsStack;
         }
     }
     handleActiveEditorChange(editorPane) {
@@ -916,12 +926,12 @@ let EditorNavigationStacks = class EditorNavigationStacks extends Disposable {
     handleActiveEditorSelectionChange(editorPane, event) {
         const previous = this.selectionsStack.current;
         this.selectionsStack.notifyNavigation(editorPane, event);
-        if (event.reason === 3 ) {
+        if (event.reason === EditorPaneSelectionChangeReason.EDIT) {
             this.editsStack.notifyNavigation(editorPane, event);
         }
-        else if (((event.reason === 4  || event.reason === 5) ) &&
+        else if ((event.reason === EditorPaneSelectionChangeReason.NAVIGATION || event.reason === EditorPaneSelectionChangeReason.JUMP) &&
             !this.selectionsStack.isNavigating()) {
-            if (event.reason === 5  && !this.navigationsStack.isNavigating()) {
+            if (event.reason === EditorPaneSelectionChangeReason.JUMP && !this.navigationsStack.isNavigating()) {
                 if (previous) {
                     this.navigationsStack.addOrReplace(previous.groupId, previous.editor, previous.selection);
                 }
@@ -1029,25 +1039,25 @@ ${entryLabels.join('\n')}
         }
         let filterLabel;
         switch (this.filter) {
-            case 0 :
+            case GoFilter.NONE:
                 filterLabel = 'global';
                 break;
-            case 1 :
+            case GoFilter.EDITS:
                 filterLabel = 'edits';
                 break;
-            case 2 :
+            case GoFilter.NAVIGATION:
                 filterLabel = 'navigation';
                 break;
         }
         let scopeLabel;
         switch (this.scope) {
-            case 0 :
+            case GoScope.DEFAULT:
                 scopeLabel = 'default';
                 break;
-            case 1 :
+            case GoScope.EDITOR_GROUP:
                 scopeLabel = 'editorGroup';
                 break;
-            case 2 :
+            case GoScope.EDITOR:
                 scopeLabel = 'editor';
                 break;
         }
@@ -1063,11 +1073,11 @@ ${entryLabels.join('\n')}
             return '<none>';
         }
         switch (event.reason) {
-            case 3 : return 'edit';
-            case 4 : return 'navigation';
-            case 5 : return 'jump';
-            case 1 : return 'programmatic';
-            case 2 : return 'user';
+            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';
         }
     }
     registerGroupListeners(groupId) {
@@ -1080,7 +1090,7 @@ ${entryLabels.join('\n')}
     }
     onWillMoveEditor(e) {
         this.trace('onWillMoveEditor()', e.editor);
-        if (this.scope === 1 ) {
+        if (this.scope === GoScope.EDITOR_GROUP) {
             return;
         }
         for (const entry of this.stack) {
@@ -1224,10 +1234,10 @@ ${entryLabels.join('\n')}
         if (!candidate.selection) {
             return false;
         }
-        return entry.selection.compare(candidate.selection) === 1 ;
+        return entry.selection.compare(candidate.selection) === EditorPaneSelectionCompareResult.IDENTICAL;
     }
     move(event) {
-        if (event.isOperation(2 )) {
+        if (event.isOperation(FileOperation.MOVE)) {
             for (const entry of this.stack) {
                 if (this.editorHelper.matchesEditor(event, entry.editor)) {
                     entry.editor = { resource: event.target.resource };
@@ -1335,7 +1345,7 @@ ${entryLabels.join('\n')}
         return this.navigate();
     }
     async maybeGoCurrent() {
-        if (this.filter === 0 ) {
+        if (this.filter === GoFilter.NONE) {
             return false;
         }
         if (this.isCurrentSelectionActive()) {
@@ -1362,7 +1372,7 @@ ${entryLabels.join('\n')}
         if (!paneSelection) {
             return false;
         }
-        return paneSelection.compare(this.current.selection) === 1 ;
+        return paneSelection.compare(this.current.selection) === EditorPaneSelectionCompareResult.IDENTICAL;
     }
     setIndex(newIndex, skipEvent) {
         this.previousIndex = this.index;
@@ -1440,7 +1450,7 @@ let EditorHelper = class EditorHelper {
                 return false;
             }
             if (arg1 instanceof FileChangesEvent) {
-                return arg1.contains(inputB.resource, 2 );
+                return arg1.contains(inputB.resource, FileChangeType.DELETED);
             }
             return this.matchesFile(inputB.resource, arg1);
         }
@@ -1457,7 +1467,7 @@ let EditorHelper = class EditorHelper {
     }
     matchesFile(resource, arg2) {
         if (arg2 instanceof FileChangesEvent) {
-            return arg2.contains(resource, 2 );
+            return arg2.contains(resource, FileChangeType.DELETED);
         }
         if (arg2 instanceof FileOperationEvent) {
             return this.uriIdentityService.extUri.isEqualOrParent(resource, arg2.resource);
@@ -1467,7 +1477,7 @@ let EditorHelper = class EditorHelper {
             if (!inputResource) {
                 return false;
             }
-            if (this.lifecycleService.phase >= 3  && !this.fileService.hasProvider(inputResource)) {
+            if (this.lifecycleService.phase >= LifecyclePhase.Restored && !this.fileService.hasProvider(inputResource)) {
                 return false;
             }
             return this.uriIdentityService.extUri.isEqual(inputResource, resource);

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -2,8 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/progressService.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Disposable, toDisposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { ProgressLocation, Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { timeout, DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { ProgressBadge } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
@@ -12,16 +13,19 @@ import { NotificationPriority, NotificationsFilter, isNotificationSource } from
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { Dialog } from 'vscode/vscode/vs/base/browser/ui/dialog/dialog';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { EventHelper } from 'vscode/vscode/vs/base/browser/dom';
 import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { ResultKind } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const _moduleId = "vs/workbench/services/progress/browser/progressService";
@@ -58,7 +62,7 @@ let ProgressService = class ProgressService extends Disposable {
             return handleStringLocation(location);
         }
         switch (location) {
-            case 15 : {
+            case ProgressLocation.Notification: {
                 let priority = options.priority;
                 if (priority !== NotificationPriority.URGENT) {
                     if (this.notificationService.getFilter() === NotificationsFilter.ERROR) {
@@ -70,20 +74,20 @@ let ProgressService = class ProgressService extends Disposable {
                 }
                 return this.withNotificationProgress({ ...options, location, priority }, task, onDidCancel);
             }
-            case 10 : {
+            case ProgressLocation.Window: {
                 const type = options.type;
                 if (options.command) {
                     return this.withWindowProgress({ ...options, location, type }, task);
                 }
-                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: 15 , type }, task, onDidCancel);
+                return this.withNotificationProgress({ delay: 150 , ...options, priority: NotificationPriority.SILENT, location: ProgressLocation.Notification, type }, task, onDidCancel);
             }
-            case 1 :
-                return this.withPaneCompositeProgress('workbench.view.explorer', 0 , task, { ...options, location });
-            case 3 :
+            case ProgressLocation.Explorer:
+                return this.withPaneCompositeProgress('workbench.view.explorer', ViewContainerLocation.Sidebar, task, { ...options, location });
+            case ProgressLocation.Scm:
                 return handleStringLocation('workbench.scm');
-            case 5 :
-                return this.withPaneCompositeProgress('workbench.view.extensions', 0 , task, { ...options, location });
-            case 20 :
+            case ProgressLocation.Extensions:
+                return this.withPaneCompositeProgress('workbench.view.extensions', ViewContainerLocation.Sidebar, task, { ...options, location });
+            case ProgressLocation.Dialog:
                 return this.withDialogProgress(options, task, onDidCancel);
             default:
                 throw ( (new Error(`Bad progress location: ${location}`)));
@@ -144,7 +148,7 @@ let ProgressService = class ProgressService extends Disposable {
                 this.windowProgressStatusEntry.update(statusEntryProperties);
             }
             else {
-                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', 0 );
+                this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT);
             }
         }
         else {
@@ -186,7 +190,7 @@ let ProgressService = class ProgressService extends Disposable {
         const createWindowProgress = () => {
             const promise = ( (new DeferredPromise()));
             this.withWindowProgress({
-                location: 10 ,
+                location: ProgressLocation.Window,
                 title: options.title ? ( (parseLinkedText(options.title).toString())) : undefined,
                 command: 'notifications.showList',
                 type: options.type
@@ -320,7 +324,7 @@ let ProgressService = class ProgressService extends Disposable {
     withPaneCompositeProgress(paneCompositeId, viewContainerLocation, task, options) {
         const progressIndicator = this.paneCompositeService.getProgressIndicator(paneCompositeId, viewContainerLocation);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
-        if (viewContainerLocation === 0 ) {
+        if (viewContainerLocation === ViewContainerLocation.Sidebar) {
             this.showOnActivityBar(paneCompositeId, options, promise);
         }
         return promise;
@@ -329,7 +333,7 @@ let ProgressService = class ProgressService extends Disposable {
         const progressIndicator = this.viewsService.getViewProgressIndicator(viewId);
         const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
         const location = this.viewDescriptorService.getViewLocationById(viewId);
-        if (location !== 0 ) {
+        if (location !== ViewContainerLocation.Sidebar) {
             return promise;
         }
         const viewletId = this.viewDescriptorService.getViewContainerByViewId(viewId)?.id;
@@ -424,7 +428,7 @@ let ProgressService = class ProgressService extends Disposable {
                 disableDefaultAction: options.sticky,
                 keyEventProcessor: (event) => {
                     const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-                    if (resolved.kind === 2  && resolved.commandId) {
+                    if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
                         if (!allowableCommands.includes(resolved.commandId)) {
                             EventHelper.stop(event, true);
                         }

package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js

@@ -7,6 +7,7 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 
 var UntitledTextEditorService_1;
 let UntitledTextEditorService = class UntitledTextEditorService extends Disposable {