@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js

@@ -3,11 +3,12 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { mark } from '../../../../base/common/performance.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
+import { TextFileResolveReason, TextFileEditorModelState, EncodingMode } from './textfiles.js';
 import { ITextFileService } from './textfiles.service.js';
-import { SaveSourceRegistry } from '../../../common/editor.js';
+import { SaveSourceRegistry, SaveReason } from '../../../common/editor.js';
 import { BaseTextEditorModel } from '../../../common/editor/textEditorModel.js';
 import { IWorkingCopyBackupService } from '../../workingCopy/common/workingCopyBackup.service.js';
-import { ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
+import { FileChangeType, FileOperationResult, ETAG_DISABLED, NotModifiedSinceFileOperationError } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -15,7 +16,7 @@ import { TaskSequentializer, timeout } from '../../../../base/common/async.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { basename } from '../../../../base/common/path.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 { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.service.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -67,7 +68,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         this._onDidChangeReadonly = this._register(( (new Emitter())));
         this.onDidChangeReadonly = this._onDidChangeReadonly.event;
         this.typeId = NO_TYPE_ID;
-        this.capabilities = 0 ;
+        this.capabilities = WorkingCopyCapabilities.None;
         this.name = basename(this.labelService.getUriLabel(this.resource));
         this.resourceHasExtension = !!extUri.extname(this.resource);
         this.versionId = 0;
@@ -92,14 +93,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         let fileEventImpactsModel = false;
         let newInOrphanModeGuess;
         if (this.inOrphanMode) {
-            const modelFileAdded = e.contains(this.resource, 1 );
+            const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
             if (modelFileAdded) {
                 newInOrphanModeGuess = false;
                 fileEventImpactsModel = true;
             }
         }
         else {
-            const modelFileDeleted = e.contains(this.resource, 2 );
+            const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
             if (modelFileDeleted) {
                 newInOrphanModeGuess = true;
                 fileEventImpactsModel = true;
@@ -166,7 +167,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                 await this.forceResolveFromFile();
             }
             catch (error) {
-                if (error.fileOperationResult !== 1 ) {
+                if (error.fileOperationResult !== FileOperationResult.FILE_NOT_FOUND) {
                     undo();
                     throw error;
                 }
@@ -223,7 +224,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             ctime = Date.now();
             size = 0;
             etag = ETAG_DISABLED;
-            this.setOrphaned(error.fileOperationResult === 1 );
+            this.setOrphaned(error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND);
         }
         const preferredEncoding = await this.textFileService.encoding.getPreferredWriteEncoding(this.resource, this.preferredEncoding);
         this.resolveFromContent({
@@ -302,14 +303,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         catch (error) {
             const result = error.fileOperationResult;
-            this.setOrphaned(result === 1 );
-            if (this.isResolved() && result === 2 ) {
+            this.setOrphaned(result === FileOperationResult.FILE_NOT_FOUND);
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_MODIFIED_SINCE) {
                 if (error instanceof NotModifiedSinceFileOperationError) {
                     this.updateLastResolvedFileStat(error.stat);
                 }
                 return;
             }
-            if (this.isResolved() && result === 1  && !forceReadFromFile) {
+            if (this.isResolved() && result === FileOperationResult.FILE_NOT_FOUND && !forceReadFromFile) {
                 return;
             }
             throw error;
@@ -350,7 +351,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.doCreateTextModel(content.resource, content.value);
         }
         this.setDirty(!!dirty);
-        this._onDidResolve.fire(options?.reason ?? 3 );
+        this._onDidResolve.fire(options?.reason ?? TextFileResolveReason.OTHER);
     }
     doCreateTextModel(resource, value) {
         this.trace('doCreateTextModel()');
@@ -461,19 +462,19 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             this.trace('save() - ignoring request for readonly resource');
             return false;
         }
-        if ((this.hasState(3 ) || this.hasState(5 )) &&
-            ((options.reason === 2  || options.reason === 3  || options.reason === 4) )) {
+        if ((this.hasState(TextFileEditorModelState.CONFLICT) || this.hasState(TextFileEditorModelState.ERROR)) &&
+            (options.reason === SaveReason.AUTO || options.reason === SaveReason.FOCUS_CHANGE || options.reason === SaveReason.WINDOW_CHANGE)) {
             this.trace('save() - ignoring auto save request for model that is in conflict or error');
             return false;
         }
         this.trace('save() - enter');
         await this.doSave(options);
         this.trace('save() - exit');
-        return this.hasState(0 );
+        return this.hasState(TextFileEditorModelState.SAVED);
     }
     async doSave(options) {
         if (typeof options.reason !== 'number') {
-            options.reason = 1 ;
+            options.reason = SaveReason.EXPLICIT;
         }
         let versionId = this.versionId;
         this.trace(`doSave(${versionId}) - enter with versionId ${versionId}`);
@@ -501,7 +502,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         return this.saveSequentializer.run(versionId, (async () => {
             if (this.isResolved() && !options.skipSaveParticipants) {
                 try {
-                    if (options.reason === 2  && typeof this.lastModelContentChangeFromUndoRedo === 'number') {
+                    if (options.reason === SaveReason.AUTO && typeof this.lastModelContentChangeFromUndoRedo === 'number') {
                         const timeFromUndoRedoToSave = Date.now() - this.lastModelContentChangeFromUndoRedo;
                         if (timeFromUndoRedoToSave < TextFileEditorModel_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD) {
                             await timeout(TextFileEditorModel_1.UNDO_REDO_SAVE_PARTICIPANTS_AUTO_SAVE_THROTTLE_THRESHOLD - timeFromUndoRedoToSave);
@@ -510,7 +511,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
                     if (!saveCancellation.token.isCancellationRequested) {
                         this.ignoreSaveFromSaveParticipants = true;
                         try {
-                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? 1 , savedFrom: options.from }, saveCancellation.token);
+                            await this.textFileService.files.runSaveParticipants(this, { reason: options.reason ?? SaveReason.EXPLICIT, savedFrom: options.from }, saveCancellation.token);
                         }
                         finally {
                             this.ignoreSaveFromSaveParticipants = false;
@@ -574,7 +575,7 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
         }
         this.setDirty(true);
         this.inErrorMode = true;
-        if (error.fileOperationResult === 3 ) {
+        if (error.fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
             this.inConflictMode = true;
         }
         this.textFileService.files.saveErrorHandler.onSaveError(error, this, options);
@@ -599,17 +600,17 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
     }
     hasState(state) {
         switch (state) {
-            case 3 :
+            case TextFileEditorModelState.CONFLICT:
                 return this.inConflictMode;
-            case 1 :
+            case TextFileEditorModelState.DIRTY:
                 return this.dirty;
-            case 5 :
+            case TextFileEditorModelState.ERROR:
                 return this.inErrorMode;
-            case 4 :
+            case TextFileEditorModelState.ORPHAN:
                 return this.inOrphanMode;
-            case 2 :
+            case TextFileEditorModelState.PENDING_SAVE:
                 return this.saveSequentializer.isRunning();
-            case 0 :
+            case TextFileEditorModelState.SAVED:
                 return !this.dirty;
         }
     }
@@ -641,14 +642,14 @@ let TextFileEditorModel = class TextFileEditorModel extends BaseTextEditorModel
             return;
         }
         this.logService.info(`Adjusting encoding based on configured language override to '${encoding}' for ${( (this.resource.toString(true)))}.`);
-        return this.setEncodingInternal(encoding, 1 );
+        return this.setEncodingInternal(encoding, EncodingMode.Decode);
     }
     setEncoding(encoding, mode) {
         this.hasEncodingSetExplicitly = true;
         return this.setEncodingInternal(encoding, mode);
     }
     async setEncodingInternal(encoding, mode) {
-        if (mode === 0 ) {
+        if (mode === EncodingMode.Encode) {
             this.updatePreferredEncoding(encoding);
             if (!this.isDirty()) {
                 this.versionId++;

package/vscode/src/vs/workbench/services/textfile/common/textfiles.js

@@ -1,16 +1,40 @@
-import { FileOperationError } from '../../../../platform/files/common/files.js';
+import { FileOperationError, FileOperationResult } from '../../../../platform/files/common/files.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { isUndefinedOrNull, areFunctions } from '../../../../base/common/types.js';
+var TextFileOperationResult;
+( (function(TextFileOperationResult) {
+    TextFileOperationResult[TextFileOperationResult["FILE_IS_BINARY"] = 0] = "FILE_IS_BINARY";
+})(TextFileOperationResult || (TextFileOperationResult = {})));
 class TextFileOperationError extends FileOperationError {
     static isTextFileOperationError(obj) {
         return obj instanceof Error && !isUndefinedOrNull(obj.textFileOperationResult);
     }
     constructor(message, textFileOperationResult, options) {
-        super(message, 10 );
+        super(message, FileOperationResult.FILE_OTHER_ERROR);
         this.textFileOperationResult = textFileOperationResult;
         this.options = options;
     }
 }
+var TextFileEditorModelState;
+( (function(TextFileEditorModelState) {
+    TextFileEditorModelState[TextFileEditorModelState["SAVED"] = 0] = "SAVED";
+    TextFileEditorModelState[TextFileEditorModelState["DIRTY"] = 1] = "DIRTY";
+    TextFileEditorModelState[TextFileEditorModelState["PENDING_SAVE"] = 2] = "PENDING_SAVE";
+    TextFileEditorModelState[TextFileEditorModelState["CONFLICT"] = 3] = "CONFLICT";
+    TextFileEditorModelState[TextFileEditorModelState["ORPHAN"] = 4] = "ORPHAN";
+    TextFileEditorModelState[TextFileEditorModelState["ERROR"] = 5] = "ERROR";
+})(TextFileEditorModelState || (TextFileEditorModelState = {})));
+var TextFileResolveReason;
+( (function(TextFileResolveReason) {
+    TextFileResolveReason[TextFileResolveReason["EDITOR"] = 1] = "EDITOR";
+    TextFileResolveReason[TextFileResolveReason["REFERENCE"] = 2] = "REFERENCE";
+    TextFileResolveReason[TextFileResolveReason["OTHER"] = 3] = "OTHER";
+})(TextFileResolveReason || (TextFileResolveReason = {})));
+var EncodingMode;
+( (function(EncodingMode) {
+    EncodingMode[EncodingMode["Encode"] = 0] = "Encode";
+    EncodingMode[EncodingMode["Decode"] = 1] = "Decode";
+})(EncodingMode || (EncodingMode = {})));
 function isTextFileEditorModel(model) {
     const candidate = model;
     return areFunctions(candidate.setEncoding, candidate.getEncoding, candidate.save, candidate.revert, candidate.isDirty, candidate.getLanguageId);
@@ -44,4 +68,4 @@ function toBufferOrReadable(value) {
         }
     };
 }
-export { TextFileOperationError, isTextFileEditorModel, stringToSnapshot, toBufferOrReadable };
+export { EncodingMode, TextFileEditorModelState, TextFileOperationError, TextFileOperationResult, TextFileResolveReason, isTextFileEditorModel, stringToSnapshot, toBufferOrReadable };

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/userDataProfile/common/userDataProfile.js

@@ -1,5 +1,5 @@
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
-import '../../../../platform/actions/common/actions.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { URI } from '../../../../base/common/uri.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
@@ -16,11 +16,16 @@ function toUserDataProfileUri(path, productService) {
     );
 }
 const defaultUserDataProfileIcon = registerIcon('defaultProfile-icon', Codicon.settings, ( localizeWithPath(_moduleId, 0, 'Icon for Default Profile.')));
+const ProfilesMenu = ( (new MenuId('Profiles')));
+const MANAGE_PROFILES_ACTION_ID = 'workbench.profiles.actions.manage';
 const PROFILES_TITLE = ( localize2WithPath(_moduleId, 1, 'Profiles'));
 const PROFILES_CATEGORY = { ...PROFILES_TITLE };
 const PROFILE_EXTENSION = 'code-profile';
 const PROFILE_FILTER = [{ name: ( localizeWithPath(_moduleId, 2, "Profile")), extensions: [PROFILE_EXTENSION] }];
+const PROFILES_ENABLEMENT_CONTEXT = ( (new RawContextKey('profiles.enabled', true)));
 const CURRENT_PROFILE_CONTEXT = ( (new RawContextKey('currentProfile', '')));
+const IS_CURRENT_PROFILE_TRANSIENT_CONTEXT = ( (new RawContextKey('isCurrentProfileTransient', false)));
+const HAS_PROFILES_CONTEXT = ( (new RawContextKey('hasProfiles', false)));
 const IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT = ( (new RawContextKey('isProfileExportInProgress', false)));
 const IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT = ( (new RawContextKey('isProfileImportInProgress', false)));
-export { CURRENT_PROFILE_CONTEXT, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, PROFILES_CATEGORY, PROFILES_TITLE, PROFILE_EXTENSION, PROFILE_FILTER, PROFILE_URL_AUTHORITY, defaultUserDataProfileIcon, toUserDataProfileUri };
+export { CURRENT_PROFILE_CONTEXT, HAS_PROFILES_CONTEXT, IS_CURRENT_PROFILE_TRANSIENT_CONTEXT, IS_PROFILE_EXPORT_IN_PROGRESS_CONTEXT, IS_PROFILE_IMPORT_IN_PROGRESS_CONTEXT, MANAGE_PROFILES_ACTION_ID, PROFILES_CATEGORY, PROFILES_ENABLEMENT_CONTEXT, PROFILES_TITLE, PROFILE_EXTENSION, PROFILE_FILTER, PROFILE_URL_AUTHORITY, ProfilesMenu, defaultUserDataProfileIcon, toUserDataProfileUri };

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 };