@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js

@@ -19,7 +19,7 @@ import { Extensions } from '../../extensionManagement/common/extensionFeatures.j
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 const _moduleId = "vs/workbench/services/themes/common/colorExtensionPoint";
 const colorRegistry = ( (Registry.as(Extensions$1.ColorContribution)));
 const colorReferenceSchema = colorRegistry.getColorReferenceSchema();
@@ -256,5 +256,5 @@ let ColorExtensionPointWorkbenchContribution = class ColorExtensionPointWorkbenc
 ColorExtensionPointWorkbenchContribution = ( (__decorate([
     ( (__param(0, IInstantiationService)))
 ], ColorExtensionPointWorkbenchContribution)));
-registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, 1 );
+registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup);
 export { ColorExtensionPoint };

package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js

@@ -7,7 +7,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { joinPath, isEqualOrParent } from '../../../../base/common/resources.js';
 import { extname, posix } from '../../../../base/common/path.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 const _moduleId = "vs/workbench/services/themes/common/iconExtensionPoint";
 const iconRegistry = ( (Registry.as(Extensions.IconContribution)));
 const iconReferenceSchema = iconRegistry.getIconReferenceSchema();
@@ -171,5 +171,5 @@ let ColorExtensionPointWorkbenchContribution = class ColorExtensionPointWorkbenc
 ColorExtensionPointWorkbenchContribution = ( (__decorate([
     ( (__param(0, IInstantiationService)))
 ], ColorExtensionPointWorkbenchContribution)));
-registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, 1 );
+registerWorkbenchContribution2(ColorExtensionPointWorkbenchContribution.ID, ColorExtensionPointWorkbenchContribution, WorkbenchPhase.BlockStartup);
 export { IconExtensionPoint };

package/vscode/src/vs/workbench/services/themes/common/workbenchThemeService.js

@@ -35,14 +35,56 @@ var ThemeSettingDefaults;
     ThemeSettingDefaults["PRODUCT_ICON_THEME"] = "Default";
 })(ThemeSettingDefaults || (ThemeSettingDefaults = {})));
 const COLOR_THEME_DARK_INITIAL_COLORS = {
+    'activityBar.activeBorder': '#0078d4',
     'activityBar.background': '#181818',
+    'activityBar.border': '#2b2b2b',
+    'activityBar.foreground': '#d7d7d7',
+    'activityBar.inactiveForeground': '#868686',
+    'editorGroup.border': '#ffffff17',
+    'editorGroupHeader.tabsBackground': '#181818',
+    'editorGroupHeader.tabsBorder': '#2b2b2b',
     'statusBar.background': '#181818',
+    'statusBar.border': '#2b2b2b',
+    'statusBar.foreground': '#cccccc',
     'statusBar.noFolderBackground': '#1f1f1f',
+    'tab.activeBackground': '#1f1f1f',
+    'tab.activeBorder': '#1f1f1f',
+    'tab.activeBorderTop': '#0078d4',
+    'tab.activeForeground': '#ffffff',
+    'tab.border': '#2b2b2b',
+    'textLink.foreground': '#4daafc',
+    'titleBar.activeBackground': '#181818',
+    'titleBar.activeForeground': '#cccccc',
+    'titleBar.border': '#2b2b2b',
+    'titleBar.inactiveBackground': '#1f1f1f',
+    'titleBar.inactiveForeground': '#9d9d9d',
+    'welcomePage.tileBackground': '#2b2b2b'
 };
 const COLOR_THEME_LIGHT_INITIAL_COLORS = {
+    'activityBar.activeBorder': '#005FB8',
     'activityBar.background': '#f8f8f8',
+    'activityBar.border': '#e5e5e5',
+    'activityBar.foreground': '#1f1f1f',
+    'activityBar.inactiveForeground': '#616161',
+    'editorGroup.border': '#e5e5e5',
+    'editorGroupHeader.tabsBackground': '#f8f8f8',
+    'editorGroupHeader.tabsBorder': '#e5e5e5',
     'statusBar.background': '#f8f8f8',
-    'statusBar.noFolderBackground': '#f8f8f8'
+    'statusBar.border': '#e5e5e5',
+    'statusBar.foreground': '#3b3b3b',
+    'statusBar.noFolderBackground': '#f8f8f8',
+    'tab.activeBackground': '#ffffff',
+    'tab.activeBorder': '#f8f8f8',
+    'tab.activeBorderTop': '#005fb8',
+    'tab.activeForeground': '#3b3b3b',
+    'tab.border': '#e5e5e5',
+    'textLink.foreground': '#005fb8',
+    'titleBar.activeBackground': '#f8f8f8',
+    'titleBar.activeForeground': '#1e1e1e',
+    'titleBar.border': '#E5E5E5',
+    'titleBar.inactiveBackground': '#f8f8f8',
+    'titleBar.inactiveForeground': '#8b949e',
+    'welcomePage.tileBackground': '#f3f3f3'
 };
 var ExtensionData;
 ( (function(ExtensionData) {

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DEFAULT_EDITOR_ASSOCIATION, findViewStateForEditor, isUntitledResourceEditorInput } from '../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, Verbosity, findViewStateForEditor, isUntitledResourceEditorInput } from '../../../common/editor.js';
 import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
 import { ITextFileService } from '../../textfile/common/textfiles.service.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
@@ -50,7 +50,7 @@ let UntitledTextEditorInput = class UntitledTextEditorInput extends AbstractText
     getName() {
         return this.model.name;
     }
-    getDescription(verbosity = 1 ) {
+    getDescription(verbosity = Verbosity.MEDIUM) {
         if (!this.model.hasAssociatedFilePath) {
             const descriptionCandidate = this.resource.path;
             if (descriptionCandidate !== this.getName()) {

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

@@ -7,7 +7,7 @@ import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyB
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { createTextBufferFactory, createTextBufferFactoryFromStream } from '../../../../editor/common/model/textModel.js';
 import { IWorkingCopyService } from '../../workingCopy/common/workingCopyService.service.js';
-import { NO_TYPE_ID } from '../../workingCopy/common/workingCopy.js';
+import { NO_TYPE_ID, WorkingCopyCapabilities } from '../../workingCopy/common/workingCopy.js';
 import { ITextFileService } from '../../textfile/common/textfiles.service.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
@@ -56,7 +56,7 @@ let UntitledTextEditorModel = class UntitledTextEditorModel extends BaseTextEdit
         this._onDidRevert = this._register(( new Emitter()));
         this.onDidRevert = this._onDidRevert.event;
         this.typeId = NO_TYPE_ID;
-        this.capabilities = 2 ;
+        this.capabilities = WorkingCopyCapabilities.Untitled;
         this.configuredLabelFormat = 'content';
         this.cachedModelFirstLineWords = undefined;
         this.dirty = this.hasAssociatedFilePath || !!this.initialValue;

package/vscode/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.js

@@ -1,9 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IconSelectBox } from '../../../../base/browser/ui/icons/iconSelectBox.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { trackFocus } from '../../../../base/browser/dom.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 var WorkbenchIconSelectBox_1;
 const WorkbenchIconSelectBoxFocusContextKey = ( new RawContextKey('iconSelectBoxFocus', true));
 const WorkbenchIconSelectBoxInputFocusContextKey = ( new RawContextKey('iconSelectBoxInputFocus', true));
@@ -36,9 +37,9 @@ WorkbenchIconSelectBox = WorkbenchIconSelectBox_1 = ( __decorate([
 ], WorkbenchIconSelectBox));
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: 16 ,
+    primary: KeyCode.UpArrow,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -48,9 +49,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: 18 ,
+    primary: KeyCode.DownArrow,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -60,9 +61,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusNext',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
-    primary: 17 ,
+    primary: KeyCode.RightArrow,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -72,9 +73,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.focusPrevious',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
-    primary: 15 ,
+    primary: KeyCode.LeftArrow,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {
@@ -84,9 +85,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'iconSelectBox.selectFocused',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchIconSelectBoxFocusContextKey,
-    primary: 3 ,
+    primary: KeyCode.Enter,
     handler: () => {
         const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
         if (selectBox) {

package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js

@@ -1,3 +1,4 @@
+import { SyncStatus, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -6,21 +7,26 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 const _moduleId = "vs/workbench/services/userDataSync/common/userDataSync";
 function getSyncAreaLabel(source) {
     switch (source) {
-        case "settings" : return ( localizeWithPath(_moduleId, 0, "Settings"));
-        case "keybindings" : return ( localizeWithPath(_moduleId, 1, "Keyboard Shortcuts"));
-        case "snippets" : return ( localizeWithPath(_moduleId, 2, "User Snippets"));
-        case "tasks" : return ( localizeWithPath(_moduleId, 3, "User Tasks"));
-        case "extensions" : return ( localizeWithPath(_moduleId, 4, "Extensions"));
-        case "globalState" : return ( localizeWithPath(_moduleId, 5, "UI State"));
-        case "profiles" : return ( localizeWithPath(_moduleId, 6, "Profiles"));
-        case "workspaceState" : return ( localizeWithPath(_moduleId, 7, "Workspace State"));
+        case SyncResource.Settings: return ( localizeWithPath(_moduleId, 0, "Settings"));
+        case SyncResource.Keybindings: return ( localizeWithPath(_moduleId, 1, "Keyboard Shortcuts"));
+        case SyncResource.Snippets: return ( localizeWithPath(_moduleId, 2, "User Snippets"));
+        case SyncResource.Tasks: return ( localizeWithPath(_moduleId, 3, "User Tasks"));
+        case SyncResource.Extensions: return ( localizeWithPath(_moduleId, 4, "Extensions"));
+        case SyncResource.GlobalState: return ( localizeWithPath(_moduleId, 5, "UI State"));
+        case SyncResource.Profiles: return ( localizeWithPath(_moduleId, 6, "Profiles"));
+        case SyncResource.WorkspaceState: return ( localizeWithPath(_moduleId, 7, "Workspace State"));
     }
 }
+var AccountStatus;
+( ((function(AccountStatus) {
+    AccountStatus["Unavailable"] = "unavailable";
+    AccountStatus["Available"] = "available";
+})(AccountStatus || (AccountStatus = {}))));
 const SYNC_TITLE = ( localize2WithPath(_moduleId, 8, "Settings Sync"));
 const SYNC_VIEW_ICON = registerIcon('settings-sync-view-icon', Codicon.sync, ( localizeWithPath(_moduleId, 9, 'View icon of the Settings Sync view.')));
-const CONTEXT_SYNC_STATE = ( (new RawContextKey('syncStatus', "uninitialized" )));
+const CONTEXT_SYNC_STATE = ( (new RawContextKey('syncStatus', SyncStatus.Uninitialized)));
 const CONTEXT_SYNC_ENABLEMENT = ( (new RawContextKey('syncEnabled', false)));
-const CONTEXT_ACCOUNT_STATE = ( (new RawContextKey('userDataSyncAccountStatus', "unavailable" )));
+const CONTEXT_ACCOUNT_STATE = ( (new RawContextKey('userDataSyncAccountStatus', AccountStatus.Unavailable)));
 const CONTEXT_ENABLE_ACTIVITY_VIEWS = ( (new RawContextKey(`enableSyncActivityViews`, false)));
 const CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW = ( (new RawContextKey(`enableSyncConflictsView`, false)));
 const CONTEXT_HAS_CONFLICTS = ( (new RawContextKey('hasConflicts', false)));
@@ -34,8 +40,8 @@ const DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR = {
     category: Categories.Developer,
     f1: true,
     precondition: ( (ContextKeyExpr.and(
-         (CONTEXT_ACCOUNT_STATE.isEqualTo("available" )),
-         (CONTEXT_SYNC_STATE.notEqualsTo("uninitialized" ))
+         (CONTEXT_ACCOUNT_STATE.isEqualTo(AccountStatus.Available)),
+         (CONTEXT_SYNC_STATE.notEqualsTo(SyncStatus.Uninitialized))
     )))
 };
-export { CONFIGURE_SYNC_COMMAND_ID, CONTEXT_ACCOUNT_STATE, CONTEXT_ENABLE_ACTIVITY_VIEWS, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, SHOW_SYNC_LOG_COMMAND_ID, SYNC_CONFLICTS_VIEW_ID, SYNC_TITLE, SYNC_VIEW_CONTAINER_ID, SYNC_VIEW_ICON, getSyncAreaLabel };
+export { AccountStatus, CONFIGURE_SYNC_COMMAND_ID, CONTEXT_ACCOUNT_STATE, CONTEXT_ENABLE_ACTIVITY_VIEWS, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, DOWNLOAD_ACTIVITY_ACTION_DESCRIPTOR, SHOW_SYNC_LOG_COMMAND_ID, SYNC_CONFLICTS_VIEW_ID, SYNC_TITLE, SYNC_VIEW_CONTAINER_ID, SYNC_VIEW_ICON, getSyncAreaLabel };

package/vscode/src/vs/workbench/services/views/browser/viewsService.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { FocusedViewContext, getVisbileViewContextKey } from '../../../common/contextkeys.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -10,6 +11,8 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { isString } from '../../../../base/common/types.js';
 import { registerAction2, Action2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
@@ -17,6 +20,7 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { PaneCompositeDescriptor, Extensions, PaneComposite } from '../../../browser/panecomposite.js';
+import { Parts } from '../../layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.service.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
@@ -239,10 +243,10 @@ let ViewsService = class ViewsService extends Disposable {
                 if (view) {
                     if (activeViewPaneContainer.views.length === 1) {
                         const location = this.viewDescriptorService.getViewContainerLocation(viewContainer);
-                        if (location === 0 ) {
-                            this.layoutService.setPartHidden(true, "workbench.parts.sidebar" );
+                        if (location === ViewContainerLocation.Sidebar) {
+                            this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
                         }
-                        else if (location === 1  || location === 2 ) {
+                        else if (location === ViewContainerLocation.Panel || location === ViewContainerLocation.AuxiliaryBar) {
                             this.paneCompositeService.hideActivePaneComposite(location);
                         }
                         if (this.focusedViewContextKey.get() === id) {
@@ -306,7 +310,7 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewContainerLocation(viewContainer);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === 0 ) {
+                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
@@ -315,7 +319,7 @@ let ViewsService = class ViewsService extends Disposable {
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
-                        keybinding: keybindings ? { ...keybindings, weight: 200  } : undefined,
+                        keybinding: keybindings ? { ...keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
                         f1: true
                     });
                 }
@@ -326,9 +330,9 @@ let ViewsService = class ViewsService extends Disposable {
                     const viewsService = serviceAccessor.get(IViewsService);
                     const viewContainerLocation = viewDescriptorService.getViewContainerLocation(viewContainer);
                     switch (viewContainerLocation) {
-                        case 2 :
-                        case 0 : {
-                            const part = viewContainerLocation === 0  ? "workbench.parts.sidebar"  : "workbench.parts.auxiliarybar" ;
+                        case ViewContainerLocation.AuxiliaryBar:
+                        case ViewContainerLocation.Sidebar: {
+                            const part = viewContainerLocation === ViewContainerLocation.Sidebar ? Parts.SIDEBAR_PART : Parts.AUXILIARYBAR_PART;
                             if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(part)) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
@@ -337,8 +341,8 @@ let ViewsService = class ViewsService extends Disposable {
                             }
                             break;
                         }
-                        case 1 :
-                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus("workbench.parts.panel" )) {
+                        case ViewContainerLocation.Panel:
+                            if (!viewsService.isViewContainerVisible(viewContainer.id) || !layoutService.hasFocus(Parts.PANEL_PART)) {
                                 await viewsService.openViewContainer(viewContainer.id, true);
                             }
                             else {
@@ -355,7 +359,7 @@ let ViewsService = class ViewsService extends Disposable {
                         id,
                         title: mnemonicTitle,
                     },
-                    group: defaultLocation === 0  ? '3_views' : '4_panels',
+                    group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
                     when: ( (ContextKeyExpr.has(getEnabledViewContainerContextKey(viewContainer.id)))),
                     order: order ?? Number.MAX_VALUE
                 }));
@@ -377,7 +381,7 @@ let ViewsService = class ViewsService extends Disposable {
                             const viewContainerLocation = that.viewDescriptorService.getViewLocationById(viewDescriptor.id);
                             const localizedTitle = typeof title === 'string' ? title : title.value;
                             const originalTitle = typeof title === 'string' ? title : title.original;
-                            if (viewContainerLocation === 0 ) {
+                            if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return { value: ( localizeWithPath(_moduleId, 1, "Show {0}", localizedTitle)), original: `Show ${originalTitle}` };
                             }
                             else {
@@ -386,7 +390,7 @@ let ViewsService = class ViewsService extends Disposable {
                         },
                         category: Categories.View,
                         precondition: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: 200  } : undefined,
+                        keybinding: viewDescriptor.openCommandActionDescriptor.keybindings ? { ...viewDescriptor.openCommandActionDescriptor.keybindings, weight: KeybindingWeight.WorkbenchContrib } : undefined,
                         f1: true
                     });
                 }
@@ -399,7 +403,7 @@ let ViewsService = class ViewsService extends Disposable {
                     const focusedViewId = FocusedViewContext.getValue(contextKeyService);
                     if (focusedViewId === viewDescriptor.id) {
                         const viewLocation = viewDescriptorService.getViewLocationById(viewDescriptor.id);
-                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === 0 ) {
+                        if (viewDescriptorService.getViewLocationById(viewDescriptor.id) === ViewContainerLocation.Sidebar) {
                             editorGroupService.activeGroup.focus();
                         }
                         else if (viewLocation !== null) {
@@ -420,7 +424,7 @@ let ViewsService = class ViewsService extends Disposable {
                             id: commandId,
                             title: viewDescriptor.openCommandActionDescriptor.mnemonicTitle,
                         },
-                        group: defaultLocation === 0  ? '3_views' : '4_panels',
+                        group: defaultLocation === ViewContainerLocation.Sidebar ? '3_views' : '4_panels',
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
                         order: viewDescriptor.openCommandActionDescriptor.order ?? Number.MAX_VALUE
                     }));
@@ -443,7 +447,7 @@ let ViewsService = class ViewsService extends Disposable {
                         }],
                     keybinding: {
                         when: ( (ContextKeyExpr.has(`${viewDescriptor.id}.active`))),
-                        weight: 200 ,
+                        weight: KeybindingWeight.WorkbenchContrib,
                         primary: viewDescriptor.focusCommand?.keybindings?.primary,
                         secondary: viewDescriptor.focusCommand?.keybindings?.secondary,
                         linux: viewDescriptor.focusCommand?.keybindings?.linux,
@@ -568,24 +572,24 @@ ViewsService = ( (__decorate([
 function getEnabledViewContainerContextKey(viewContainerId) { return `viewContainer.${viewContainerId}.enabled`; }
 function getPaneCompositeExtension(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case 2 :
+        case ViewContainerLocation.AuxiliaryBar:
             return Extensions.Auxiliary;
-        case 1 :
+        case ViewContainerLocation.Panel:
             return Extensions.Panels;
-        case 0 :
+        case ViewContainerLocation.Sidebar:
         default:
             return Extensions.Viewlets;
     }
 }
 function getPartByLocation(viewContainerLocation) {
     switch (viewContainerLocation) {
-        case 2 :
-            return "workbench.parts.auxiliarybar" ;
-        case 1 :
-            return "workbench.parts.panel" ;
-        case 0 :
+        case ViewContainerLocation.AuxiliaryBar:
+            return Parts.AUXILIARYBAR_PART;
+        case ViewContainerLocation.Panel:
+            return Parts.PANEL_PART;
+        case ViewContainerLocation.Sidebar:
         default:
-            return "workbench.parts.sidebar" ;
+            return Parts.SIDEBAR_PART;
     }
 }
 export { ViewsService, getPartByLocation };

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.js

@@ -0,0 +1,6 @@
+var SnapshotContext;
+( (function(SnapshotContext) {
+    SnapshotContext[SnapshotContext["Save"] = 1] = "Save";
+    SnapshotContext[SnapshotContext["Backup"] = 2] = "Backup";
+})(SnapshotContext || (SnapshotContext = {})));
+export { SnapshotContext };

package/vscode/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.js

@@ -3,6 +3,7 @@ import { timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { FileChangeType } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
     constructor(resource, fileService) {
@@ -23,14 +24,14 @@ let ResourceWorkingCopy = class ResourceWorkingCopy extends Disposable {
         let fileEventImpactsUs = false;
         let newInOrphanModeGuess;
         if (this.orphaned) {
-            const fileWorkingCopyResourceAdded = e.contains(this.resource, 1 );
+            const fileWorkingCopyResourceAdded = e.contains(this.resource, FileChangeType.ADDED);
             if (fileWorkingCopyResourceAdded) {
                 newInOrphanModeGuess = false;
                 fileEventImpactsUs = true;
             }
         }
         else {
-            const fileWorkingCopyResourceDeleted = e.contains(this.resource, 2 );
+            const fileWorkingCopyResourceDeleted = e.contains(this.resource, FileChangeType.DELETED);
             if (fileWorkingCopyResourceDeleted) {
                 newInOrphanModeGuess = true;
                 fileEventImpactsUs = true;