@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts

@@ -90,6 +90,7 @@ type ICloseEditorsFilter = {
 };
 interface ICloseAllEditorsOptions {
     readonly excludeSticky?: boolean;
+    readonly excludeConfirming?: boolean;
 }
 interface IEditorReplacement {
     readonly editor: EditorInput;
@@ -323,12 +324,16 @@ interface IEditorGroupsContainer {
      * will be moved over to the target and the source group will close. Configure to
      * `MOVE_EDITORS_KEEP_GROUP` to prevent the source group from closing. Set to
      * `COPY_EDITORS` to copy the editors into the target instead of moding them.
+     *
+     * @returns if merging was successful
      */
-    mergeGroup(group: IEditorGroup | GroupIdentifier, target: IEditorGroup | GroupIdentifier, options?: IMergeGroupOptions): IEditorGroup;
+    mergeGroup(group: IEditorGroup | GroupIdentifier, target: IEditorGroup | GroupIdentifier, options?: IMergeGroupOptions): boolean;
     /**
      * Merge all editor groups into the target one.
+     *
+     * @returns if merging was successful
      */
-    mergeAllGroups(target: IEditorGroup | GroupIdentifier): IEditorGroup;
+    mergeAllGroups(target: IEditorGroup | GroupIdentifier): boolean;
     /**
      * Copy a group to a new group in the container.
      *
@@ -385,14 +390,20 @@ interface IAuxiliaryEditorPart extends IEditorPart {
     /**
      * Close this auxiliary editor part after moving all
      * editors of all groups back to the main editor part.
+     *
+     * @returns `false` if an editor could not be moved back.
      */
-    close(): void;
+    close(): boolean;
 }
 interface IAuxiliaryEditorPartCreateEvent {
     readonly part: IAuxiliaryEditorPart;
     readonly instantiationService: IInstantiationService;
     readonly disposables: DisposableStore;
 }
+interface IEditorWorkingSet {
+    readonly id: string;
+    readonly name: string;
+}
 interface IActiveEditorActions {
     readonly actions: IToolbarActions;
     readonly onDidChange: Event<IMenuChangeEvent | void>;
@@ -667,4 +678,4 @@ interface IEditorGroup {
     createEditorActions(disposables: DisposableStore): IActiveEditorActions;
 }
 
-export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, type IAuxiliaryEditorPartCreateEvent, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorDropTargetDelegate, type IEditorGroup, type IEditorGroupsContainer, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, type IAuxiliaryEditorPartCreateEvent, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorDropTargetDelegate, type IEditorGroup, type IEditorGroupsContainer, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IEditorWorkingSet, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts

@@ -2,7 +2,7 @@ import { ServiceIdentifier } from '../../../../platform/instantiation/common/ins
 import { Event } from '../../../../base/common/event.js';
 import { GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent } from '../../../common/editor.js';
 import { IRectangle } from '../../../../platform/window/common/window.js';
-import { IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorPart, IEditorGroup, IAuxiliaryEditorPart } from './editorGroupsService.js';
+import { IEditorGroupsContainer, IAuxiliaryEditorPartCreateEvent, IEditorPart, IEditorGroup, IAuxiliaryEditorPart, IEditorWorkingSet } from './editorGroupsService.js';
 
 declare const IEditorGroupsService: ServiceIdentifier<IEditorGroupsService>;
 /**
@@ -45,6 +45,25 @@ interface IEditorGroupsService extends IEditorGroupsContainer {
     createAuxiliaryEditorPart(options?: {
         bounds?: Partial<IRectangle>;
     }): Promise<IAuxiliaryEditorPart>;
+    /**
+    * Save a new editor working set from the currently opened
+    * editors and group layout.
+    */
+    saveWorkingSet(name: string): IEditorWorkingSet;
+    /**
+    * Returns all known editor working sets.
+    */
+    getWorkingSets(): IEditorWorkingSet[];
+    /**
+    * Applies the working set. Use `empty` to apply an empty working set.
+    *
+    * @returns `true` when the working set as applied.
+    */
+    applyWorkingSet(workingSet: IEditorWorkingSet | 'empty'): Promise<boolean>;
+    /**
+    * Deletes a working set.
+    */
+    deleteWorkingSet(workingSet: IEditorWorkingSet): void;
 }
 
 export { IEditorGroupsService };

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts

@@ -19,7 +19,6 @@ interface IWorkbenchExtensionManagementService extends IProfileAwareExtensionMan
     onDidUninstallExtension: Event<DidUninstallExtensionOnServerEvent>;
     onDidChangeProfile: Event<DidChangeProfileForServerEvent>;
     onDidEnableExtensions: Event<IExtension[]>;
-    isWorkspaceExtensionsSupported(): boolean;
     getExtensions(locations: URI[]): Promise<IResourceExtension[]>;
     getInstalledWorkspaceExtensions(includeInvalid: boolean): Promise<ILocalExtension[]>;
     installVSIX(location: URI, manifest: IExtensionManifest, installOptions?: InstallOptions): Promise<ILocalExtension>;

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts

@@ -123,7 +123,10 @@ declare abstract class AbstractExtensionService extends Disposable implements IE
     getExtensionsStatus(): {
         [id: string]: IExtensionsStatus;
     };
-    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<number[]>;
+    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<{
+        port: number;
+        host: string;
+    }[]>;
     setRemoteEnvironment(env: {
         [key: string]: string | null;
     }): Promise<void>;

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts

@@ -23,7 +23,10 @@ interface IExtensionHostManager {
     activate(extension: ExtensionIdentifier, reason: ExtensionActivationReason): Promise<boolean>;
     activateByEvent(activationEvent: string, activationKind: ActivationKind): Promise<void>;
     activationEventIsDone(activationEvent: string): boolean;
-    getInspectPort(tryEnableInspector: boolean): Promise<number>;
+    getInspectPort(tryEnableInspector: boolean): Promise<{
+        port: number;
+        host: string;
+    } | undefined>;
     resolveAuthority(remoteAuthority: string, resolveAttempt: number): Promise<IResolveAuthorityResult>;
     /**
      * Returns `null` if no resolver for `remoteAuthority` is found.

package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocation.d.ts

@@ -17,7 +17,7 @@ declare class LocalWebWorkerRunningLocation {
 declare class RemoteRunningLocation {
     readonly kind = ExtensionHostKind.Remote;
     readonly affinity = 0;
-    equals(other: ExtensionRunningLocation): boolean;
+    equals(other: ExtensionRunningLocation): other is RemoteRunningLocation;
     asString(): string;
 }
 type ExtensionRunningLocation = LocalProcessRunningLocation | LocalWebWorkerRunningLocation | RemoteRunningLocation;

package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts

@@ -50,7 +50,10 @@ interface IExtensionHost {
         string | null
     ]>;
     start(): Promise<IMessagePassingProtocol>;
-    getInspectPort(): number | undefined;
+    getInspectPort(): {
+        port: number;
+        host: string;
+    } | undefined;
     enableInspectPort(): Promise<boolean>;
     dispose(): void;
 }
@@ -97,7 +100,10 @@ interface IResponsiveStateChangeEvent {
     /**
      * Return the inspect port or `0`. `0` means inspection is not possible.
      */
-    getInspectPort(tryEnableInspector: boolean): Promise<number>;
+    getInspectListener(tryEnableInspector: boolean): Promise<{
+        port: number;
+        host: string;
+    } | undefined>;
 }
 declare const enum ActivationKind {
     Normal = 0,

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

@@ -215,7 +215,8 @@ function toExtensionDescription(extension, isUnderDevelopment) {
         extensionLocation: extension.location,
         ...extension.manifest,
         uuid: extension.identifier.uuid,
-        targetPlatform: extension.targetPlatform
+        targetPlatform: extension.targetPlatform,
+        publisherDisplayName: extension.publisherDisplayName,
     };
 }
 class NullExtensionService {

package/vscode/src/vs/workbench/services/extensions/common/extensions.service.d.ts

@@ -105,7 +105,10 @@ interface IExtensionService {
     /**
     * Return the inspect ports (if inspection is possible) for extension hosts of kind `extensionHostKind`.
     */
-    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<number[]>;
+    getInspectPorts(extensionHostKind: ExtensionHostKind, tryEnableInspector: boolean): Promise<{
+        port: number;
+        host: string;
+    }[]>;
     /**
     * Stops the extension hosts.
     *

package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js

@@ -18,6 +18,7 @@ const allApiProposals = ( Object.freeze({
     commentThreadApplicability: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts',
     commentingRangeHint: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentingRangeHint.d.ts',
     commentsDraftState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
+    contribAccessibilityHelpContent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts',
     contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
     contribCommentPeekContext: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentPeekContext.d.ts',
     contribCommentThreadAdditionalMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentThreadAdditionalMenu.d.ts',
@@ -49,8 +50,8 @@ const allApiProposals = ( Object.freeze({
     diffContentOptions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffContentOptions.d.ts',
     documentFiltersExclusive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentFiltersExclusive.d.ts',
     documentPaste: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.documentPaste.d.ts',
-    dropMetadata: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.dropMetadata.d.ts',
     editSessionIdentityProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
+    editorHoverVerbosityLevel: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts',
     editorInsets: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
     extensionRuntime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
     extensionsAny: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
@@ -60,7 +61,6 @@ const allApiProposals = ( Object.freeze({
     findFiles2: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findFiles2.d.ts',
     findTextInFiles: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts',
     fsChunks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
-    handleIssueUri: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts',
     idToken: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
     inlineCompletionsAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
     inlineEdit: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineEdit.d.ts',
@@ -108,6 +108,7 @@ const allApiProposals = ( Object.freeze({
     terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
     terminalShellIntegration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts',
     testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
+    testPreserveFocus: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testPreserveFocus.d.ts',
     textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
     timeline: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',
     tokenInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tokenInformation.d.ts',
@@ -116,7 +117,6 @@ const allApiProposals = ( Object.freeze({
     treeViewReveal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.treeViewReveal.d.ts',
     tunnelFactory: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnelFactory.d.ts',
     tunnels: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tunnels.d.ts',
-    windowActivity: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.windowActivity.d.ts',
     workspaceTrust: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.workspaceTrust.d.ts'
 }));
 export { allApiProposals };

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -123,13 +123,18 @@ class LanguageTableRenderer extends Disposable {
     render(manifest) {
         const contributes = manifest.contributes;
         const rawLanguages = contributes?.languages || [];
-        const languages = ( (rawLanguages.map(l => ({
-            id: l.id,
-            name: (l.aliases || [])[0] || l.id,
-            extensions: l.extensions || [],
-            hasGrammar: false,
-            hasSnippets: false
-        }))));
+        const languages = [];
+        for (const l of rawLanguages) {
+            if (isValidLanguageExtensionPoint(l)) {
+                languages.push({
+                    id: l.id,
+                    name: (l.aliases || [])[0] || l.id,
+                    extensions: l.extensions || [],
+                    hasGrammar: false,
+                    hasSnippets: false
+                });
+            }
+        }
         const byId = index(languages, l => l.id);
         const grammars = contributes?.grammars || [];
         grammars.forEach(grammar => {
@@ -212,7 +217,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
                 }
                 for (let j = 0, lenJ = extension.value.length; j < lenJ; j++) {
                     const ext = extension.value[j];
-                    if (isValidLanguageExtensionPoint(ext, extension.description, extension.collector)) {
+                    if (isValidLanguageExtensionPoint(ext, extension.collector)) {
                         let configuration = undefined;
                         if (ext.configuration) {
                             configuration = joinPath(extension.description.extensionLocation, ext.configuration);
@@ -282,13 +287,13 @@ function isUndefinedOrStringArray(value) {
     }
     return value.every(item => typeof item === 'string');
 }
-function isValidLanguageExtensionPoint(value, extension, collector) {
+function isValidLanguageExtensionPoint(value, collector) {
     if (!value) {
-        collector.error(( localizeWithPath(_moduleId, 19, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
+        collector?.error(( localizeWithPath(_moduleId, 19, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
         return false;
     }
     if (typeof value.id !== 'string') {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             20,
             "property `{0}` is mandatory and must be of type `string`",
@@ -297,7 +302,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (!isUndefinedOrStringArray(value.extensions)) {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             21,
             "property `{0}` can be omitted and must be of type `string[]`",
@@ -306,7 +311,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (!isUndefinedOrStringArray(value.filenames)) {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             22,
             "property `{0}` can be omitted and must be of type `string[]`",
@@ -315,7 +320,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (typeof value.firstLine !== 'undefined' && typeof value.firstLine !== 'string') {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             23,
             "property `{0}` can be omitted and must be of type `string`",
@@ -324,7 +329,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (typeof value.configuration !== 'undefined' && typeof value.configuration !== 'string') {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             24,
             "property `{0}` can be omitted and must be of type `string`",
@@ -333,7 +338,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (!isUndefinedOrStringArray(value.aliases)) {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             25,
             "property `{0}` can be omitted and must be of type `string[]`",
@@ -342,7 +347,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
         return false;
     }
     if (!isUndefinedOrStringArray(value.mimetypes)) {
-        collector.error(( localizeWithPath(
+        collector?.error(( localizeWithPath(
             _moduleId,
             26,
             "property `{0}` can be omitted and must be of type `string[]`",
@@ -352,7 +357,7 @@ function isValidLanguageExtensionPoint(value, extension, collector) {
     }
     if (typeof value.icon !== 'undefined') {
         if (typeof value.icon !== 'object' || typeof value.icon.light !== 'string' || typeof value.icon.dark !== 'string') {
-            collector.error(( localizeWithPath(
+            collector?.error(( localizeWithPath(
                 _moduleId,
                 27,
                 "property `{0}` can be omitted and must be of type `object` with properties `{1}` and `{2}` of type `string`",

package/vscode/src/vs/workbench/services/layout/browser/layoutService.js

@@ -1,4 +1,4 @@
-import { isMacintosh, isNative, isWeb } from '../../../../base/common/platform.js';
+import { isWeb, isMacintosh, isNative } from '../../../../base/common/platform.js';
 import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
 import { hasNativeTitlebar, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
 import { isFullscreen, isWCOEnabled } from '../../../../base/browser/browser.js';
@@ -54,9 +54,11 @@ function panelOpensMaximizedFromString(str) {
 function shouldShowCustomTitleBar(configurationService, window, menuBarToggled) {
     const inFullscreen = isFullscreen(window);
     const nativeTitleBarEnabled = hasNativeTitlebar(configurationService);
-    const showCustomTitleBar = configurationService.getValue("window.customTitleBarVisibility" );
-    if (showCustomTitleBar === "never"  && nativeTitleBarEnabled || showCustomTitleBar === "windowed"  && inFullscreen) {
-        return false;
+    if (!isWeb) {
+        const showCustomTitleBar = configurationService.getValue("window.customTitleBarVisibility" );
+        if (showCustomTitleBar === "never"  && nativeTitleBarEnabled || showCustomTitleBar === "windowed"  && inFullscreen) {
+            return false;
+        }
     }
     if (!isTitleBarEmpty(configurationService)) {
         return true;

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js

@@ -13,15 +13,23 @@ import { getAllUnboundCommands } from '../../keybinding/browser/unboundCommands.
 import { isString, isEmptyObject } from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 var KeybindingsEditorModel_1;
 const _moduleId = "vs/workbench/services/preferences/browser/keybindingsEditorModel";
 const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
 const SOURCE_SYSTEM = ( localizeWithPath(_moduleId, 0, "System"));
 const SOURCE_EXTENSION = ( localizeWithPath(_moduleId, 1, "Extension"));
 const SOURCE_USER = ( localizeWithPath(_moduleId, 2, "User"));
+function createKeybindingCommandQuery(commandId, when) {
+    const whenPart = when ? ` +when:${when}` : '';
+    return `@command:${commandId}${whenPart}`;
+}
 const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
+const COMMAND_REGEX = /@command:\s*([^\+]+)/i;
+const WHEN_REGEX = /\+when:\s*(.+)/i;
 const SOURCE_REGEX = /@source:\s*(user|default|system|extension)/i;
 const EXTENSION_REGEX = /@ext:\s*((".+")|([^\s]+))/i;
+const KEYBINDING_REGEX = /@keybinding:\s*((\".+\")|(\S+))/i;
 let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorModel extends EditorModel {
     constructor(os, keybindingsService, extensionService) {
         super();
@@ -37,11 +45,19 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
     }
     fetch(searchValue, sortByPrecedence = false) {
         let keybindingItems = sortByPrecedence ? this._keybindingItemsSortedByPrecedence : this._keybindingItems;
-        const commandIdMatches = /@command:\s*(.+)/i.exec(searchValue);
+        const commandIdMatches = COMMAND_REGEX.exec(searchValue);
         if (commandIdMatches && commandIdMatches[1]) {
+            const command = commandIdMatches[1].trim();
+            let filteredKeybindingItems = keybindingItems.filter(k => k.command === command);
+            if (filteredKeybindingItems.length) {
+                const whenMatches = WHEN_REGEX.exec(searchValue);
+                if (whenMatches && whenMatches[1]) {
+                    const whenValue = whenMatches[1].trim();
+                    filteredKeybindingItems = this.filterByWhen(filteredKeybindingItems, command, whenValue);
+                }
+            }
             return (
-                 (keybindingItems.filter(k => k.command === commandIdMatches[1])
-                    .map(
+                 (filteredKeybindingItems.map(
                     keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
                 ))
             );
@@ -58,7 +74,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
                 searchValue = searchValue.replace(EXTENSION_REGEX, '');
             }
             else {
-                const keybindingMatches = /@keybinding:\s*((\".+\")|(\S+))/i.exec(searchValue);
+                const keybindingMatches = KEYBINDING_REGEX.exec(searchValue);
                 if (keybindingMatches && (keybindingMatches[2] || keybindingMatches[3])) {
                     searchValue = keybindingMatches[2] || `"${keybindingMatches[3]}"`;
                 }
@@ -138,6 +154,27 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         return result;
     }
+    filterByWhen(keybindingItems, command, when) {
+        if (keybindingItems.length === 0) {
+            return [];
+        }
+        const keybindingItemsWithWhen = keybindingItems.filter(k => k.when === when);
+        if (keybindingItemsWithWhen.length) {
+            return keybindingItemsWithWhen;
+        }
+        const commandLabel = keybindingItems[0].commandLabel;
+        const keybindingItem = ( (new ResolvedKeybindingItem(
+            undefined,
+            command,
+            null,
+            ContextKeyExpr.deserialize(when),
+            false,
+            null,
+            false
+        )));
+        const actionLabels = ( (new Map([[command, commandLabel]])));
+        return [KeybindingsEditorModel_1.toKeybindingEntry(command, keybindingItem, actionLabels, this.getExtensionsMapping())];
+    }
     splitKeybindingWords(wordsSeparatedBySpaces) {
         const result = [];
         for (const word of wordsSeparatedBySpaces) {
@@ -146,10 +183,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         return result;
     }
     async resolve(actionLabels = ( (new Map()))) {
-        const extensions = ( (new ExtensionIdentifierMap()));
-        for (const extension of this.extensionService.extensions) {
-            extensions.set(extension.identifier, extension);
-        }
+        const extensions = this.getExtensionsMapping();
         this._keybindingItemsSortedByPrecedence = [];
         const boundCommands = ( (new Map()));
         for (const keybinding of this.keybindingsService.getKeybindings()) {
@@ -178,6 +212,13 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
     static getId(keybindingItem) {
         return keybindingItem.command + (keybindingItem?.keybinding?.getAriaLabel() ?? '') + keybindingItem.when + (isString(keybindingItem.source) ? keybindingItem.source : keybindingItem.source.identifier.value);
     }
+    getExtensionsMapping() {
+        const extensions = ( (new ExtensionIdentifierMap()));
+        for (const extension of this.extensionService.extensions) {
+            extensions.set(extension.identifier, extension);
+        }
+        return extensions;
+    }
     static compareKeybindingData(a, b) {
         if (a.keybinding && !b.keybinding) {
             return -1;
@@ -558,4 +599,4 @@ class KeybindingItemMatches {
         return false;
     }
 }
-export { KEYBINDING_ENTRY_TEMPLATE_ID, KeybindingsEditorModel };
+export { KEYBINDING_ENTRY_TEMPLATE_ID, KeybindingsEditorModel, createKeybindingCommandQuery };

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

@@ -21,6 +21,7 @@ var ThemeSettings;
     ThemeSettings["PREFERRED_HC_LIGHT_THEME"] = "workbench.preferredHighContrastLightColorTheme";
     ThemeSettings["DETECT_COLOR_SCHEME"] = "window.autoDetectColorScheme";
     ThemeSettings["DETECT_HC"] = "window.autoDetectHighContrast";
+    ThemeSettings["SYSTEM_COLOR_THEME"] = "window.systemColorTheme";
 })(ThemeSettings || (ThemeSettings = {})));
 var ThemeSettingDefaults;
 ( (function(ThemeSettingDefaults) {

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

@@ -0,0 +1,97 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { IconSelectBox } from '../../../../base/browser/ui/icons/iconSelectBox.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';
+var WorkbenchIconSelectBox_1;
+const WorkbenchIconSelectBoxFocusContextKey = ( new RawContextKey('iconSelectBoxFocus', true));
+const WorkbenchIconSelectBoxInputFocusContextKey = ( new RawContextKey('iconSelectBoxInputFocus', true));
+const WorkbenchIconSelectBoxInputEmptyContextKey = ( new RawContextKey('iconSelectBoxInputEmpty', true));
+let WorkbenchIconSelectBox = class WorkbenchIconSelectBox extends IconSelectBox {
+    static { WorkbenchIconSelectBox_1 = this; }
+    static getFocusedWidget() {
+        return WorkbenchIconSelectBox_1.focusedWidget;
+    }
+    constructor(options, contextKeyService) {
+        super(options);
+        this.contextKeyService = this._register(contextKeyService.createScoped(this.domNode));
+        WorkbenchIconSelectBoxFocusContextKey.bindTo(this.contextKeyService);
+        this.inputFocusContextKey = WorkbenchIconSelectBoxInputFocusContextKey.bindTo(this.contextKeyService);
+        this.inputEmptyContextKey = WorkbenchIconSelectBoxInputEmptyContextKey.bindTo(this.contextKeyService);
+        if (this.inputBox) {
+            const focusTracker = this._register(trackFocus(this.inputBox.inputElement));
+            this._register(focusTracker.onDidFocus(() => this.inputFocusContextKey.set(true)));
+            this._register(focusTracker.onDidBlur(() => this.inputFocusContextKey.set(false)));
+            this._register(this.inputBox.onDidChange(() => this.inputEmptyContextKey.set(this.inputBox?.value.length === 0)));
+        }
+    }
+    focus() {
+        super.focus();
+        WorkbenchIconSelectBox_1.focusedWidget = this;
+    }
+};
+WorkbenchIconSelectBox = WorkbenchIconSelectBox_1 = ( __decorate([
+    ( __param(1, IContextKeyService))
+], WorkbenchIconSelectBox));
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'iconSelectBox.focusUp',
+    weight: 200 ,
+    when: WorkbenchIconSelectBoxFocusContextKey,
+    primary: 16 ,
+    handler: () => {
+        const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
+        if (selectBox) {
+            selectBox.focusPreviousRow();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'iconSelectBox.focusDown',
+    weight: 200 ,
+    when: WorkbenchIconSelectBoxFocusContextKey,
+    primary: 18 ,
+    handler: () => {
+        const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
+        if (selectBox) {
+            selectBox.focusNextRow();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'iconSelectBox.focusNext',
+    weight: 200 ,
+    when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
+    primary: 17 ,
+    handler: () => {
+        const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
+        if (selectBox) {
+            selectBox.focusNext();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'iconSelectBox.focusPrevious',
+    weight: 200 ,
+    when: ( ContextKeyExpr.and(WorkbenchIconSelectBoxFocusContextKey, ( ContextKeyExpr.or(WorkbenchIconSelectBoxInputEmptyContextKey, ( WorkbenchIconSelectBoxInputFocusContextKey.toNegated()))))),
+    primary: 15 ,
+    handler: () => {
+        const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
+        if (selectBox) {
+            selectBox.focusPrevious();
+        }
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'iconSelectBox.selectFocused',
+    weight: 200 ,
+    when: WorkbenchIconSelectBoxFocusContextKey,
+    primary: 3 ,
+    handler: () => {
+        const selectBox = WorkbenchIconSelectBox.getFocusedWidget();
+        if (selectBox) {
+            selectBox.setSelection(selectBox.getFocus()[0]);
+        }
+    }
+});
+export { WorkbenchIconSelectBox, WorkbenchIconSelectBoxFocusContextKey, WorkbenchIconSelectBoxInputEmptyContextKey, WorkbenchIconSelectBoxInputFocusContextKey };

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.d.ts

@@ -14,6 +14,10 @@ interface IFileWorkingCopyModelConfiguration {
      */
     readonly backupDelay?: number;
 }
+declare const enum SnapshotContext {
+    Save = 1,
+    Backup = 2
+}
 /**
  * A generic file working copy model to be reused by untitled
  * and stored file working copies.
@@ -47,9 +51,10 @@ interface IFileWorkingCopyModel extends IDisposable {
      * Snapshots the model's current content for writing. This must include
      * any changes that were made to the model that are in memory.
      *
+     * @param context indicates in what context the snapshot is used
      * @param token support for cancellation
      */
-    snapshot(token: CancellationToken): Promise<VSBufferReadableStream>;
+    snapshot(context: SnapshotContext, token: CancellationToken): Promise<VSBufferReadableStream>;
     /**
      * Updates the model with the provided contents. The implementation should
      * behave in a similar fashion as `IFileWorkingCopyModelFactory#createModel`
@@ -96,4 +101,4 @@ interface IResolvedFileWorkingCopy<M extends IFileWorkingCopyModel> extends IFil
     readonly model: M;
 }
 
-export type { IFileWorkingCopy, IFileWorkingCopyModel, IFileWorkingCopyModelConfiguration, IResolvedFileWorkingCopy };
+export { type IFileWorkingCopy, type IFileWorkingCopyModel, type IFileWorkingCopyModelConfiguration, type IResolvedFileWorkingCopy, SnapshotContext };

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

@@ -338,7 +338,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
         }
         let content = undefined;
         if (this.isResolved()) {
-            content = await raceCancellation(this.model.snapshot(token), token);
+            content = await raceCancellation(this.model.snapshot(2 , token), token);
         }
         return { meta, content };
     }
@@ -437,7 +437,7 @@ let StoredFileWorkingCopy = class StoredFileWorkingCopy extends ResourceWorkingC
                         stat = await resolvedFileWorkingCopy.model.save(writeFileOptions, saveCancellation.token);
                     }
                     else {
-                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(saveCancellation.token), saveCancellation.token);
+                        const snapshot = await raceCancellation(resolvedFileWorkingCopy.model.snapshot(1 , saveCancellation.token), saveCancellation.token);
                         if (saveCancellation.token.isCancellationRequested) {
                             return;
                         }