@codingame/monaco-vscode-api 22.1.9 → 23.0.1

package/vscode/src/vs/platform/actions/common/actions.d.ts

@@ -27,10 +27,26 @@ export interface ISubmenuItem {
     group?: "navigation" | string;
     order?: number;
     isSelection?: boolean;
-    rememberDefaultAction?: boolean;
+    /**
+     * A split button shows the first action
+     * as primary action and the rest of the
+     * actions in a dropdown.
+     *
+     * Use `togglePrimaryAction` to promote
+     * the action that was last used to be
+     * the primary action and remember that
+     * choice.
+     */
+    isSplitButton?: boolean | {
+        /**
+         * Will update the primary action based
+         * on the action that was last run.
+         */
+        togglePrimaryAction: true;
+    };
 }
-export declare function isIMenuItem(item: any): item is IMenuItem;
-export declare function isISubmenuItem(item: any): item is ISubmenuItem;
+export declare function isIMenuItem(item: unknown): item is IMenuItem;
+export declare function isISubmenuItem(item: unknown): item is ISubmenuItem;
 export declare class MenuId {
     private static readonly _instances;
     static readonly CommandPalette: MenuId;
@@ -112,8 +128,9 @@ export declare class MenuId {
     static readonly SCMHistoryTitle: MenuId;
     static readonly SCMHistoryItemContext: MenuId;
     static readonly SCMHistoryItemChangeContext: MenuId;
-    static readonly SCMHistoryItemHover: MenuId;
     static readonly SCMHistoryItemRefContext: MenuId;
+    static readonly SCMArtifactGroupContext: MenuId;
+    static readonly SCMArtifactContext: MenuId;
     static readonly SCMQuickDiffDecorations: MenuId;
     static readonly SCMTitle: MenuId;
     static readonly SearchContext: MenuId;
@@ -214,10 +231,9 @@ export declare class MenuId {
     static readonly ChatCompareBlock: MenuId;
     static readonly ChatMessageTitle: MenuId;
     static readonly ChatHistory: MenuId;
-    static readonly ChatWelcomeHistoryContext: MenuId;
+    static readonly ChatWelcomeContext: MenuId;
     static readonly ChatMessageFooter: MenuId;
     static readonly ChatExecute: MenuId;
-    static readonly ChatExecuteSecondary: MenuId;
     static readonly ChatInput: MenuId;
     static readonly ChatInputSide: MenuId;
     static readonly ChatModePicker: MenuId;
@@ -233,6 +249,7 @@ export declare class MenuId {
     static readonly ChatInlineSymbolAnchorContext: MenuId;
     static readonly ChatMessageCheckpoint: MenuId;
     static readonly ChatMessageRestoreCheckpoint: MenuId;
+    static readonly ChatNewMenu: MenuId;
     static readonly ChatEditingCodeBlockContext: MenuId;
     static readonly ChatTitleBarMenu: MenuId;
     static readonly ChatAttachmentsContext: MenuId;
@@ -241,7 +258,10 @@ export declare class MenuId {
     static readonly ChatToolOutputResourceContext: MenuId;
     static readonly ChatMultiDiffContext: MenuId;
     static readonly ChatSessionsMenu: MenuId;
+    static readonly ChatSessionsCreateSubMenu: MenuId;
     static readonly ChatConfirmationMenu: MenuId;
+    static readonly ChatEditorInlineExecute: MenuId;
+    static readonly ChatEditorInlineInputSide: MenuId;
     static readonly AccessibleView: MenuId;
     static readonly MultiDiffEditorFileToolbar: MenuId;
     static readonly DiffEditorHunkToolbar: MenuId;
@@ -259,7 +279,7 @@ export declare class MenuId {
     constructor(identifier: string);
 }
 export interface IMenuActionOptions {
-    arg?: any;
+    arg?: unknown;
     shouldForwardArgs?: boolean;
     renderShortTitle?: boolean;
 }
@@ -333,7 +353,7 @@ export declare class MenuItemAction implements IAction {
     readonly enabled: boolean;
     readonly checked?: boolean;
     constructor(item: ICommandAction, alt: ICommandAction | undefined, options: IMenuActionOptions | undefined, hideActions: IMenuItemHide | undefined, menuKeybinding: IAction | undefined, contextKeyService: IContextKeyService, _commandService: ICommandService);
-    run(...args: any[]): Promise<void>;
+    run(...args: unknown[]): Promise<void>;
 }
 type OneOrN<T> = T | T[];
 interface IAction2CommonOptions extends ICommandAction {
@@ -384,7 +404,7 @@ export interface IAction2F1RequiredOptions {
 export declare abstract class Action2 {
     readonly desc: Readonly<IAction2Options>;
     constructor(desc: Readonly<IAction2Options>);
-    abstract run(accessor: ServicesAccessor, ...args: any[]): void;
+    abstract run(accessor: ServicesAccessor, ...args: unknown[]): void;
 }
 export declare function registerAction2(ctor: {
     new (): Action2;

package/vscode/src/vs/platform/actions/common/actions.js

@@ -99,8 +99,9 @@ class MenuId {
     static { this.SCMHistoryTitle = ( new MenuId('SCMHistoryTitle')); }
     static { this.SCMHistoryItemContext = ( new MenuId('SCMHistoryItemContext')); }
     static { this.SCMHistoryItemChangeContext = ( new MenuId('SCMHistoryItemChangeContext')); }
-    static { this.SCMHistoryItemHover = ( new MenuId('SCMHistoryItemHover')); }
     static { this.SCMHistoryItemRefContext = ( new MenuId('SCMHistoryItemRefContext')); }
+    static { this.SCMArtifactGroupContext = ( new MenuId('SCMArtifactGroupContext')); }
+    static { this.SCMArtifactContext = ( new MenuId('SCMArtifactContext')); }
     static { this.SCMQuickDiffDecorations = ( new MenuId('SCMQuickDiffDecorations')); }
     static { this.SCMTitle = ( new MenuId('SCMTitle')); }
     static { this.SearchContext = ( new MenuId('SearchContext')); }
@@ -201,10 +202,9 @@ class MenuId {
     static { this.ChatCompareBlock = ( new MenuId('ChatCompareBlock')); }
     static { this.ChatMessageTitle = ( new MenuId('ChatMessageTitle')); }
     static { this.ChatHistory = ( new MenuId('ChatHistory')); }
-    static { this.ChatWelcomeHistoryContext = ( new MenuId('ChatWelcomeHistoryContext')); }
+    static { this.ChatWelcomeContext = ( new MenuId('ChatWelcomeContext')); }
     static { this.ChatMessageFooter = ( new MenuId('ChatMessageFooter')); }
     static { this.ChatExecute = ( new MenuId('ChatExecute')); }
-    static { this.ChatExecuteSecondary = ( new MenuId('ChatExecuteSecondary')); }
     static { this.ChatInput = ( new MenuId('ChatInput')); }
     static { this.ChatInputSide = ( new MenuId('ChatInputSide')); }
     static { this.ChatModePicker = ( new MenuId('ChatModePicker')); }
@@ -220,6 +220,7 @@ class MenuId {
     static { this.ChatInlineSymbolAnchorContext = ( new MenuId('ChatInlineSymbolAnchorContext')); }
     static { this.ChatMessageCheckpoint = ( new MenuId('ChatMessageCheckpoint')); }
     static { this.ChatMessageRestoreCheckpoint = ( new MenuId('ChatMessageRestoreCheckpoint')); }
+    static { this.ChatNewMenu = ( new MenuId('ChatNewMenu')); }
     static { this.ChatEditingCodeBlockContext = ( new MenuId('ChatEditingCodeBlockContext')); }
     static { this.ChatTitleBarMenu = ( new MenuId('ChatTitleBarMenu')); }
     static { this.ChatAttachmentsContext = ( new MenuId('ChatAttachmentsContext')); }
@@ -228,7 +229,10 @@ class MenuId {
     static { this.ChatToolOutputResourceContext = ( new MenuId('ChatToolOutputResourceContext')); }
     static { this.ChatMultiDiffContext = ( new MenuId('ChatMultiDiffContext')); }
     static { this.ChatSessionsMenu = ( new MenuId('ChatSessionsMenu')); }
+    static { this.ChatSessionsCreateSubMenu = ( new MenuId('ChatSessionsCreateSubMenu')); }
     static { this.ChatConfirmationMenu = ( new MenuId('ChatConfirmationMenu')); }
+    static { this.ChatEditorInlineExecute = ( new MenuId('ChatEditorInputExecute')); }
+    static { this.ChatEditorInlineInputSide = ( new MenuId('ChatEditorInputSide')); }
     static { this.AccessibleView = ( new MenuId('AccessibleView')); }
     static { this.MultiDiffEditorFileToolbar = ( new MenuId('MultiDiffEditorFileToolbar')); }
     static { this.DiffEditorHunkToolbar = ( new MenuId('DiffEditorHunkToolbar')); }

package/vscode/src/vs/platform/actions/common/menuResetAction.js

@@ -9,7 +9,7 @@ class MenuHiddenStatesReset extends Action2 {
     constructor() {
         super({
             id: 'menu.resetHiddenStates',
-            title: ( localize2(1739, "Reset All Menus")),
+            title: ( localize2(1746, "Reset All Menus")),
             category: Categories.View,
             f1: true
         });

package/vscode/src/vs/platform/actions/common/menuService.js

@@ -408,7 +408,7 @@ function createMenuHide(menu, command, states) {
     const title = typeof command.title === 'string' ? command.title : command.title.value;
     const hide = toAction({
         id: `hide/${menu.id}/${id}`,
-        label: ( localize(1740, 'Hide \'{0}\'', title)),
+        label: ( localize(1747, 'Hide \'{0}\'', title)),
         run() { states.updateHidden(menu, id, true); }
     });
     const toggle = toAction({
@@ -426,7 +426,7 @@ function createMenuHide(menu, command, states) {
 function createConfigureKeybindingAction(commandService, keybindingService, commandId, when = undefined, enabled = true) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
-        label: ( localize(1741, "Configure Keybinding")),
+        label: ( localize(1748, "Configure Keybinding")),
         enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);

package/vscode/src/vs/platform/commands/common/commands.d.ts

@@ -5,16 +5,14 @@ import { TypeConstraint } from "../../../base/common/types.js";
 import { ILocalizedString } from "../../action/common/action.js";
 import { ServicesAccessor } from "../../instantiation/common/instantiation.js";
 export interface ICommandEvent {
-    commandId: string;
-    args: any[];
+    readonly commandId: string;
+    readonly args: unknown[];
 }
 export type ICommandsMap = Map<string, ICommand>;
-export interface ICommandHandler {
-    (accessor: ServicesAccessor, ...args: any[]): void;
-}
-export interface ICommand {
+export type ICommandHandler<Args extends unknown[] = unknown[], R = void> = (accessor: ServicesAccessor, ...args: Args) => R;
+export interface ICommand<Args extends unknown[] = unknown[], R = void> {
     id: string;
-    handler: ICommandHandler;
+    handler: ICommandHandler<Args, R>;
     metadata?: ICommandMetadata | null;
 }
 export interface ICommandMetadata {
@@ -36,9 +34,9 @@ export interface ICommandMetadata {
     readonly returns?: string;
 }
 export interface ICommandRegistry {
-    onDidRegisterCommand: Event<string>;
-    registerCommand(id: string, command: ICommandHandler): IDisposable;
-    registerCommand(command: ICommand): IDisposable;
+    readonly onDidRegisterCommand: Event<string>;
+    registerCommand<Args extends unknown[]>(id: string, command: ICommandHandler<Args>): IDisposable;
+    registerCommand<Args extends unknown[]>(command: ICommand<Args>): IDisposable;
     registerCommandAlias(oldId: string, newId: string): IDisposable;
     getCommand(id: string): ICommand | undefined;
     getCommands(): ICommandsMap;

package/vscode/src/vs/platform/commands/common/commands.service.d.ts

@@ -3,7 +3,7 @@ import { ICommandEvent } from "./commands.js";
 export declare const ICommandService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ICommandService>;
 export interface ICommandService {
     readonly _serviceBrand: undefined;
-    onWillExecuteCommand: Event<ICommandEvent>;
-    onDidExecuteCommand: Event<ICommandEvent>;
-    executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T | undefined>;
+    readonly onWillExecuteCommand: Event<ICommandEvent>;
+    readonly onDidExecuteCommand: Event<ICommandEvent>;
+    executeCommand<R = unknown>(commandId: string, ...args: unknown[]): Promise<R | undefined>;
 }

package/vscode/src/vs/platform/configuration/common/configuration.service.d.ts

@@ -4,7 +4,7 @@ import { IConfigurationChangeEvent, IConfigurationData, IConfigurationOverrides,
 export declare const IConfigurationService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IConfigurationService>;
 export interface IConfigurationService {
     readonly _serviceBrand: undefined;
-    onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
+    readonly onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
     getConfigurationData(): IConfigurationData | null;
     /**
     * Fetches the value of the section for the given overrides.
@@ -44,6 +44,7 @@ export interface IConfigurationService {
     reloadConfiguration(target?: ConfigurationTarget | IWorkspaceFolder): Promise<void>;
     keys(): {
         default: string[];
+        policy: string[];
         user: string[];
         workspace: string[];
         workspaceFolder: string[];

package/vscode/src/vs/platform/configuration/common/configurationModels.d.ts

@@ -105,6 +105,7 @@ export declare class Configuration {
     inspect<C>(key: string, overrides: IConfigurationOverrides, workspace: Workspace | undefined): IConfigurationValue<C>;
     keys(workspace: Workspace | undefined): {
         default: string[];
+        policy: string[];
         user: string[];
         workspace: string[];
         workspaceFolder: string[];

package/vscode/src/vs/platform/configuration/common/configurationModels.js

@@ -667,6 +667,7 @@ let Configuration$1 = class Configuration {
         const folderConfigurationModel = this.getFolderConfigurationModelForResource(undefined, workspace);
         return {
             default: this._defaultConfiguration.keys.slice(0),
+            policy: this._policyConfiguration.keys.slice(0),
             user: this.userConfiguration.keys.slice(0),
             workspace: this._workspaceConfiguration.keys.slice(0),
             workspaceFolder: folderConfigurationModel ? folderConfigurationModel.keys.slice(0) : []

package/vscode/src/vs/platform/configuration/common/configurationRegistry.d.ts

@@ -214,6 +214,12 @@ export interface IConfigurationDefaults {
     source?: IExtensionInfo;
 }
 export type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchema & {
+    section?: {
+        id?: string;
+        title?: string;
+        order?: number;
+        extensionInfo?: IExtensionInfo;
+    };
     defaultDefaultValue?: any;
     source?: IExtensionInfo;
     defaultValueSource?: ConfigurationDefaultValueSource;
@@ -261,10 +267,11 @@ export declare const OVERRIDE_PROPERTY_REGEX: RegExp;
 export declare function overrideIdentifiersFromKey(key: string): string[];
 export declare function keyFromOverrideIdentifiers(overrideIdentifiers: string[]): string;
 export declare function getDefaultValue(type: string | string[] | undefined): {} | null;
-export declare function validateProperty(property: string, schema: IRegisteredConfigurationPropertySchema): string | null;
+export declare function validateProperty(property: string, schema: IRegisteredConfigurationPropertySchema, extensionId?: string): string | null;
 export declare function getScopes(): [
     string,
     ConfigurationScope | undefined
 ][];
 export declare function getAllConfigurationProperties(configurationNode: IConfigurationNode[]): IStringDictionary<IRegisteredConfigurationPropertySchema>;
 export declare function parseScope(scope: string): ConfigurationScope;
+export declare const EXTENSION_UNIFICATION_EXTENSION_IDS: Set<string>;

package/vscode/src/vs/platform/configuration/common/configurationRegistry.js

@@ -7,6 +7,7 @@ import { getLanguageTagSettingPlainKey } from './configuration.js';
 import { Extensions as Extensions$1 } from '../../jsonschemas/common/jsonContributionRegistry.js';
 import { Registry } from '../../registry/common/platform.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
+import product from '../../product/common/product.js';
 
 var EditPresentationTypes;
 (function (EditPresentationTypes) {
@@ -48,7 +49,7 @@ class ConfigurationRegistry extends Disposable {
         this.configurationDefaultsOverrides = ( new Map());
         this.defaultLanguageConfigurationOverridesNode = {
             id: 'defaultOverrides',
-            title: ( localize(1742, "Default Language Configuration Overrides")),
+            title: ( localize(1749, "Default Language Configuration Overrides")),
             properties: {}
         };
         this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
@@ -194,10 +195,16 @@ class ConfigurationRegistry extends Disposable {
     }
     updateDefaultOverrideProperty(key, newDefaultOverride, source) {
         const property = {
+            section: {
+                id: this.defaultLanguageConfigurationOverridesNode.id,
+                title: this.defaultLanguageConfigurationOverridesNode.title,
+                order: this.defaultLanguageConfigurationOverridesNode.order,
+                extensionInfo: this.defaultLanguageConfigurationOverridesNode.extensionInfo
+            },
             type: 'object',
             default: newDefaultOverride.value,
             description: ( localize(
-                1743,
+                1750,
                 "Configure settings to be overridden for {0}.",
                 getLanguageTagSettingPlainKey(key)
             )),
@@ -331,7 +338,13 @@ class ConfigurationRegistry extends Disposable {
         if (properties) {
             for (const key in properties) {
                 const property = properties[key];
-                if (validate && validateProperty(key, property)) {
+                property.section = {
+                    id: configuration.id,
+                    title: configuration.title,
+                    order: configuration.order,
+                    extensionInfo: configuration.extensionInfo
+                };
+                if (validate && validateProperty(key, property, extensionInfo?.id)) {
                     delete properties[key];
                     continue;
                 }
@@ -478,8 +491,8 @@ class ConfigurationRegistry extends Disposable {
             const overrideIdentifierProperty = `[${overrideIdentifier}]`;
             const resourceLanguagePropertiesSchema = {
                 type: 'object',
-                description: ( localize(1744, "Configure editor settings to be overridden for a language.")),
-                errorMessage: ( localize(1745, "This setting does not support per-language configuration.")),
+                description: ( localize(1751, "Configure editor settings to be overridden for a language.")),
+                errorMessage: ( localize(1752, "This setting does not support per-language configuration.")),
                 $ref: resourceLanguageSettingsSchemaId,
             };
             this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
@@ -495,8 +508,8 @@ class ConfigurationRegistry extends Disposable {
     registerOverridePropertyPatternKey() {
         const resourceLanguagePropertiesSchema = {
             type: 'object',
-            description: ( localize(1744, "Configure editor settings to be overridden for a language.")),
-            errorMessage: ( localize(1745, "This setting does not support per-language configuration.")),
+            description: ( localize(1751, "Configure editor settings to be overridden for a language.")),
+            errorMessage: ( localize(1752, "This setting does not support per-language configuration.")),
             $ref: resourceLanguageSettingsSchemaId,
         };
         allSettings.patternProperties[OVERRIDE_PROPERTY_PATTERN] = resourceLanguagePropertiesSchema;
@@ -570,27 +583,27 @@ function getDefaultValue(type) {
 }
 const configurationRegistry = ( new ConfigurationRegistry());
 Registry.add(Extensions.Configuration, configurationRegistry);
-function validateProperty(property, schema) {
+function validateProperty(property, schema, extensionId) {
     if (!property.trim()) {
-        return localize(1746, "Cannot register an empty property");
+        return localize(1753, "Cannot register an empty property");
     }
     if (OVERRIDE_PROPERTY_REGEX.test(property)) {
         return localize(
-            1747,
+            1754,
             "Cannot register '{0}'. This matches property pattern '\\\\[.*\\\\]$' for describing language specific editor settings. Use 'configurationDefaults' contribution.",
             property
         );
     }
-    if (configurationRegistry.getConfigurationProperties()[property] !== undefined) {
+    if (configurationRegistry.getConfigurationProperties()[property] !== undefined && (!extensionId || !( EXTENSION_UNIFICATION_EXTENSION_IDS.has(extensionId.toLowerCase())))) {
         return localize(
-            1748,
+            1755,
             "Cannot register '{0}'. This property is already registered.",
             property
         );
     }
     if (schema.policy?.name && configurationRegistry.getPolicyConfigurations().get(schema.policy?.name) !== undefined) {
         return localize(
-            1749,
+            1756,
             "Cannot register '{0}'. The associated policy {1} is already registered with {2}.",
             property,
             schema.policy?.name,
@@ -640,5 +653,6 @@ function parseScope(scope) {
             return ConfigurationScope.WINDOW;
     }
 }
+const EXTENSION_UNIFICATION_EXTENSION_IDS = ( new Set(product.defaultChatAgent ? ( [product.defaultChatAgent.extensionId, product.defaultChatAgent.chatExtensionId].map(id => id.toLowerCase())) : []));
 
-export { ConfigurationScope, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationMachineSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };
+export { ConfigurationScope, EXTENSION_UNIFICATION_EXTENSION_IDS, EditPresentationTypes, Extensions, OVERRIDE_PROPERTY_PATTERN, OVERRIDE_PROPERTY_REGEX, allSettings, applicationMachineSettings, applicationSettings, configurationDefaultsSchemaId, getAllConfigurationProperties, getDefaultValue, getScopes, keyFromOverrideIdentifiers, machineOverridableSettings, machineSettings, overrideIdentifiersFromKey, parseScope, resourceLanguageSettingsSchemaId, resourceSettings, validateProperty, windowSettings };

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.d.ts

@@ -1,10 +1,9 @@
 import { Event, PauseableEmitter } from "../../../base/common/event.js";
 import { Disposable } from "../../../base/common/lifecycle.js";
 import { IConfigurationService } from "../../configuration/common/configuration.service.js";
+import { ServicesAccessor } from "../../instantiation/common/instantiation.js";
 import { ContextKeyExpression, ContextKeyValue, IContext, IContextKey, IContextKeyChangeEvent, IContextKeyServiceTarget, IScopedContextKeyService } from "../common/contextkey.js";
 import { IContextKeyService } from "../common/contextkey.service.js";
-import { ServicesAccessor } from "../../instantiation/common/instantiation.js";
-import { ILayoutService } from "../../layout/browser/layoutService.service.js";
 export declare class Context implements IContext {
     protected _parent: Context | null;
     protected _value: Record<string, any>;
@@ -47,7 +46,7 @@ export declare class ContextKeyService extends AbstractContextKeyService impleme
     private _lastContextId;
     private readonly _contexts;
     private inputFocusedContext;
-    constructor(configurationService: IConfigurationService, layoutService: ILayoutService);
+    constructor(configurationService: IConfigurationService);
     private updateInputContextKeys;
     getContextValuesContainer(contextId: number): Context;
     createChildContext(parentContextId?: number): number;

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -1,5 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { onDidRegisterWindow, trackActiveElement, getActiveElement, isEditableElement, trackFocus, getActiveDocument } from '../../../base/browser/dom.js';
+import { mainWindow } from '../../../base/browser/window.js';
 import { PauseableEmitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
@@ -14,9 +16,6 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 import { RawContextKey } from '../common/contextkey.js';
 import { IContextKeyService } from '../common/contextkey.service.js';
 import { InputFocusedContext } from '../common/contextkeys.js';
-import { mainWindow } from '../../../base/browser/window.js';
-import { onDidRegisterWindow, addDisposableListener, EventType, getActiveElement, isEditableElement, trackFocus, getActiveDocument } from '../../../base/browser/dom.js';
-import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 
 const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context';
 class Context {
@@ -302,7 +301,7 @@ class AbstractContextKeyService extends Disposable {
     }
 }
 let ContextKeyService = class ContextKeyService extends AbstractContextKeyService {
-    constructor(configurationService, layoutService) {
+    constructor(configurationService) {
         super(0);
         this._contexts = ( new Map());
         this._lastContextId = 0;
@@ -311,21 +310,20 @@ let ContextKeyService = class ContextKeyService extends AbstractContextKeyServic
         this._contexts.set(this._myContextId, myContext);
         this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => {
             const onFocusDisposables = disposables.add(( new MutableDisposable()));
-            disposables.add(addDisposableListener(layoutService.getContainer(window), EventType.FOCUS_IN, () => {
+            const activeElementTracker = disposables.add(trackActiveElement(window));
+            activeElementTracker.onDidChangeActiveElement((activeElement) => {
                 onFocusDisposables.value = ( new DisposableStore());
-                this.updateInputContextKeys(window.document, onFocusDisposables.value);
-            }, true));
+                this.updateInputContextKeys(window.document, activeElement, onFocusDisposables.value);
+            });
         }, { window: mainWindow, disposables: this._store }));
     }
-    updateInputContextKeys(ownerDocument, disposables) {
-        function activeElementIsInput() {
-            const activeElement = getActiveElement(ownerDocument);
+    updateInputContextKeys(ownerDocument, activeElement, disposables) {
+        function activeElementIsInput(activeElement = getActiveElement(ownerDocument)) {
             return !!activeElement && isEditableElement(activeElement);
         }
-        const isInputFocused = activeElementIsInput();
+        const isInputFocused = activeElementIsInput(activeElement);
         this.inputFocusedContext.set(isInputFocused);
         if (isInputFocused) {
-            const activeElement = getActiveElement(ownerDocument);
             const tracker = disposables.add(trackFocus(activeElement));
             Event.once(tracker.onDidBlur)(() => {
                 if (getActiveDocument() === ownerDocument) {
@@ -359,8 +357,7 @@ let ContextKeyService = class ContextKeyService extends AbstractContextKeyServic
     }
 };
 ContextKeyService = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, ILayoutService))
+    ( __param(0, IConfigurationService))
 ], ContextKeyService));
 class ScopedContextKeyService extends AbstractContextKeyService {
     constructor(parent, domNode) {
@@ -518,7 +515,7 @@ CommandsRegistry.registerCommand({
         return [...RawContextKey.all()].sort((a, b) => a.key.localeCompare(b.key));
     },
     metadata: {
-        description: ( localize(1750, "A command that returns information about context keys")),
+        description: ( localize(1757, "A command that returns information about context keys")),
         args: []
     }
 });

package/vscode/src/vs/platform/contextkey/common/contextkey.js

@@ -47,17 +47,17 @@ var ContextKeyExprType;
 const defaultConfig = {
     regexParsingWithErrorRecovery: true
 };
-const errorEmptyString = ( localize(1751, "Empty context key expression"));
+const errorEmptyString = ( localize(1758, "Empty context key expression"));
 const hintEmptyString = ( localize(
-    1752,
+    1759,
     "Did you forget to write an expression? You can also put 'false' or 'true' to always evaluate to false or true, respectively."
 ));
-const errorNoInAfterNot = ( localize(1753, "'in' after 'not'."));
-const errorClosingParenthesis = ( localize(1754, "closing parenthesis ')'"));
-const errorUnexpectedToken = ( localize(1755, "Unexpected token"));
-const hintUnexpectedToken = ( localize(1756, "Did you forget to put && or || before the token?"));
-const errorUnexpectedEOF = ( localize(1757, "Unexpected end of expression"));
-const hintUnexpectedEOF = ( localize(1758, "Did you forget to put a context key?"));
+const errorNoInAfterNot = ( localize(1760, "'in' after 'not'."));
+const errorClosingParenthesis = ( localize(1761, "closing parenthesis ')'"));
+const errorUnexpectedToken = ( localize(1762, "Unexpected token"));
+const hintUnexpectedToken = ( localize(1763, "Did you forget to put && or || before the token?"));
+const errorUnexpectedEOF = ( localize(1764, "Unexpected end of expression"));
+const hintUnexpectedEOF = ( localize(1765, "Did you forget to put a context key?"));
 class Parser {
     static { this._parseError = ( new Error()); }
     get lexingErrors() {
@@ -369,7 +369,7 @@ class Parser {
         throw this._errExpectedButGot(message, this._peek());
     }
     _errExpectedButGot(expected, got, additionalInfo) {
-        const message = ( localize(1759, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
+        const message = ( localize(1766, "Expected: {0}\nReceived: '{1}'.", expected, Scanner.getLexeme(got)));
         const offset = got.offset;
         const lexeme = Scanner.getLexeme(got);
         this._parsingErrors.push({ message, offset, lexeme, additionalInfo });
@@ -447,8 +447,8 @@ function validateWhenClauses(whenClauses) {
         if (parser.lexingErrors.length > 0) {
             return (parser.lexingErrors.map((se) => ({
                 errorMessage: se.additionalInfo ?
-                    ( localize(1760, "Unexpected token. Hint: {0}", se.additionalInfo)) :
-                    ( localize(1761, "Unexpected token.")),
+                    ( localize(1767, "Unexpected token. Hint: {0}", se.additionalInfo)) :
+                    ( localize(1768, "Unexpected token.")),
                 offset: se.offset,
                 length: se.lexeme.length,
             })));

package/vscode/src/vs/platform/contextkey/common/contextkey.service.d.ts

@@ -3,7 +3,7 @@ import { IContextKeyChangeEvent, ContextKeyValue, IContextKey, ContextKeyExpress
 export declare const IContextKeyService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IContextKeyService>;
 export interface IContextKeyService {
     readonly _serviceBrand: undefined;
-    onDidChangeContext: Event<IContextKeyChangeEvent>;
+    readonly onDidChangeContext: Event<IContextKeyChangeEvent>;
     bufferChangeEvents(callback: Function): void;
     createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): IContextKey<T>;
     contextMatchesRules(rules: ContextKeyExpression | undefined): boolean;

package/vscode/src/vs/platform/contextkey/common/contextkeys.js

@@ -3,16 +3,16 @@ import { isMacintosh, isLinux, isWindows, isWeb, isIOS, isMobile } from '../../.
 import { localize } from '../../../nls.js';
 import { RawContextKey } from './contextkey.js';
 
-const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1762, "Whether the operating system is macOS"))));
-const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1763, "Whether the operating system is Linux"))));
-const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1764, "Whether the operating system is Windows"))));
-const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1765, "Whether the platform is a web browser"))));
-const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1766, "Whether the operating system is macOS on a non-browser platform"))));
-const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1767, "Whether the operating system is iOS"))));
-const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1768, "Whether the platform is a mobile web browser"))));
+const IsMacContext = ( new RawContextKey('isMac', isMacintosh, ( localize(1769, "Whether the operating system is macOS"))));
+const IsLinuxContext = ( new RawContextKey('isLinux', isLinux, ( localize(1770, "Whether the operating system is Linux"))));
+const IsWindowsContext = ( new RawContextKey('isWindows', isWindows, ( localize(1771, "Whether the operating system is Windows"))));
+const IsWebContext = ( new RawContextKey('isWeb', isWeb, ( localize(1772, "Whether the platform is a web browser"))));
+const IsMacNativeContext = ( new RawContextKey('isMacNative', isMacintosh && !isWeb, ( localize(1773, "Whether the operating system is macOS on a non-browser platform"))));
+const IsIOSContext = ( new RawContextKey('isIOS', isIOS, ( localize(1774, "Whether the operating system is iOS"))));
+const IsMobileContext = ( new RawContextKey('isMobile', isMobile, ( localize(1775, "Whether the platform is a mobile web browser"))));
 const IsDevelopmentContext = ( new RawContextKey('isDevelopment', false, true));
-const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1769, "Quality type of VS Code"))));
+const ProductQualityContext = ( new RawContextKey('productQualityType', '', ( localize(1776, "Quality type of VS Code"))));
 const InputFocusedContextKey = 'inputFocus';
-const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1770, "Whether keyboard focus is inside an input box"))));
+const InputFocusedContext = ( new RawContextKey(InputFocusedContextKey, false, ( localize(1777, "Whether keyboard focus is inside an input box"))));
 
 export { InputFocusedContext, InputFocusedContextKey, IsDevelopmentContext, IsIOSContext, IsLinuxContext, IsMacContext, IsMacNativeContext, IsMobileContext, IsWebContext, IsWindowsContext, ProductQualityContext };

package/vscode/src/vs/platform/contextkey/common/scanner.js

@@ -30,18 +30,18 @@ var TokenType;
 function hintDidYouMean(...meant) {
     switch (meant.length) {
         case 1:
-            return localize(1771, "Did you mean {0}?", meant[0]);
+            return localize(1778, "Did you mean {0}?", meant[0]);
         case 2:
-            return localize(1772, "Did you mean {0} or {1}?", meant[0], meant[1]);
+            return localize(1779, "Did you mean {0} or {1}?", meant[0], meant[1]);
         case 3:
-            return localize(1773, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
+            return localize(1780, "Did you mean {0}, {1} or {2}?", meant[0], meant[1], meant[2]);
         default:
             return undefined;
     }
 }
-const hintDidYouForgetToOpenOrCloseQuote = ( localize(1774, "Did you forget to open or close the quote?"));
+const hintDidYouForgetToOpenOrCloseQuote = ( localize(1781, "Did you forget to open or close the quote?"));
 const hintDidYouForgetToEscapeSlash = ( localize(
-    1775,
+    1782,
     "Did you forget to escape the '/' (slash) character? Put two backslashes before it to escape, e.g., '\\\\/\'."
 ));
 class Scanner {

package/vscode/src/vs/platform/dataChannel/browser/forwardingTelemetryService.js

@@ -60,7 +60,7 @@ let DataChannelForwardingTelemetryService = class DataChannelForwardingTelemetry
                 forward = Boolean(data[shouldForwardToChannel]);
             }
             if (forward) {
-                dataChannelService.getDataChannel('editTelemetry').sendData({ eventName, data: data });
+                dataChannelService.getDataChannel('editTelemetry').sendData({ eventName, data: data ?? {} });
             }
         });
     }

package/vscode/src/vs/platform/dialogs/common/dialogs.service.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { URI } from "../../../base/common/uri.js";
-import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IPromptWithCustomCancel, IPromptResultWithCancel, IPromptWithDefaultCancel, IPromptResult, IPrompt, IInput, IInputResult, type ConfirmResult, type IOpenDialogOptions, type IPickAndOpenOptions, type ISaveDialogOptions } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/dialogs/common/dialogs";
 export declare const IDialogService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IDialogService>;
 /**
 * A service to bring up modal dialogs.
@@ -13,11 +13,11 @@ export interface IDialogService {
     /**
     * An event that fires when a dialog is about to show.
     */
-    onWillShowDialog: Event<void>;
+    readonly onWillShowDialog: Event<void>;
     /**
     * An event that fires when a dialog did show (closed).
     */
-    onDidShowDialog: Event<void>;
+    readonly onDidShowDialog: Event<void>;
     /**
     * Ask the user for confirmation with a modal dialog.
     */