@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/platform/actions/browser/buttonbar.js

@@ -2,10 +2,12 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { ButtonBar } from '../../../base/browser/ui/button/button.js';
 import { createInstantHoverDelegate } from '../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { ActionRunner, SubmenuAction } from '../../../base/common/actions.js';
+import { Codicon } from '../../../base/common/codicons.js';
 import { Emitter } from '../../../base/common/event.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { localizeWithPath } from '../../../nls.js';
+import { createAndFillInActionBarActions } from './menuEntryActionViewItem.js';
 import { MenuItemAction } from '../common/actions.js';
 import { IMenuService } from '../common/actions.service.js';
 import { IContextKeyService } from '../../contextkey/common/contextkey.service.js';
@@ -38,7 +40,7 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
         this._store.dispose();
         super.dispose();
     }
-    update(actions) {
+    update(actions, secondary) {
         const conifgProvider = this._options?.buttonConfigProvider ?? (() => ({ showLabel: true }));
         this._updateStore.clear();
         this.clear();
@@ -90,11 +92,30 @@ let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
             else {
                 tooltip = action.label;
             }
-            this._updateStore.add(this._hoverService.setupUpdatableHover(hoverDelegate, btn.element, tooltip));
+            this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, tooltip));
             this._updateStore.add(btn.onDidClick(async () => {
                 this._actionRunner.run(action);
             }));
         }
+        if (secondary.length > 0) {
+            const btn = this.addButton({
+                secondary: true,
+                ariaLabel: ( localizeWithPath(_moduleId, 1, "More Actions"))
+            });
+            btn.icon = Codicon.dropDownButton;
+            btn.element.classList.add('default-colors', 'monaco-text-button');
+            btn.enabled = true;
+            this._updateStore.add(this._hoverService.setupManagedHover(hoverDelegate, btn.element, ( localizeWithPath(_moduleId, 1, "More Actions"))));
+            this._updateStore.add(btn.onDidClick(async () => {
+                this._contextMenuService.showContextMenu({
+                    getAnchor: () => btn.element,
+                    getActions: () => secondary,
+                    actionRunner: this._actionRunner,
+                    onHide: () => btn.element.setAttribute('aria-expanded', 'false')
+                });
+                btn.element.setAttribute('aria-expanded', 'true');
+            }));
+        }
         this._onDidChange.fire(this);
     }
 };
@@ -111,10 +132,10 @@ let MenuWorkbenchButtonBar = class MenuWorkbenchButtonBar extends WorkbenchButto
         this._store.add(menu);
         const update = () => {
             this.clear();
-            const actions = menu
-                .getActions({ renderShortTitle: true })
-                .flatMap(entry => entry[1]);
-            super.update(actions);
+            const primary = [];
+            const secondary = [];
+            createAndFillInActionBarActions(menu, options?.menuOptions, { primary, secondary }, options?.toolbarOptions?.primaryGroup);
+            super.update(primary, secondary);
         };
         this._store.add(menu.onDidChange(update));
         update();

package/vscode/src/vs/platform/actions/browser/floatingMenu.js

@@ -92,7 +92,7 @@ let FloatingClickMenu = class FloatingClickMenu extends AbstractFloatingClickMen
         const w = this.instantiationService.createInstance(FloatingClickWidget, action.label);
         const node = w.getDomNode();
         this.options.container.appendChild(node);
-        disposable.add(toDisposable(() => this.options.container.removeChild(node)));
+        disposable.add(toDisposable(() => node.remove()));
         return w;
     }
     getActionArg() {

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-action-bar .action-item.menu-entry .action-label.icon{background-position:50%;background-repeat:no-repeat;background-size:16px;height:16px;width:16px}.monaco-dropdown-with-default{border-radius:5px;display:flex!important;flex-direction:row}.monaco-dropdown-with-default>.action-container>.action-label{margin-right:0}.monaco-dropdown-with-default>.action-container.menu-entry>.action-label.icon{background-position:50%;background-repeat:no-repeat;background-size:16px;height:16px;width:16px}.monaco-dropdown-with-default:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-dropdown-with-default>.dropdown-action-container>.monaco-dropdown>.dropdown-label .codicon[class*=codicon-]{font-size:12px;line-height:16px;margin-left:-3px;padding-left:0;padding-right:0}.monaco-dropdown-with-default>.dropdown-action-container>.monaco-dropdown>.dropdown-label>.action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block}";
+var css = ".monaco-action-bar .action-item.menu-entry .action-label.icon{background-position:50%;background-repeat:no-repeat;background-size:16px;height:16px;width:16px}.monaco-action-bar .action-item.menu-entry.text-only .action-label{border-radius:2px;color:var(--vscode-descriptionForeground);overflow:hidden}.monaco-action-bar .action-item.menu-entry.text-only.use-comma:not(:last-of-type) .action-label:after{content:\", \"}.monaco-action-bar .action-item.menu-entry.text-only+.action-item:not(.text-only)>.monaco-dropdown .action-label{color:var(--vscode-descriptionForeground)}.monaco-dropdown-with-default{border-radius:5px;display:flex!important;flex-direction:row}.monaco-dropdown-with-default>.action-container>.action-label{margin-right:0}.monaco-dropdown-with-default>.action-container.menu-entry>.action-label.icon{background-position:50%;background-repeat:no-repeat;background-size:16px;height:16px;width:16px}.monaco-dropdown-with-default:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-dropdown-with-default>.dropdown-action-container>.monaco-dropdown>.dropdown-label .codicon[class*=codicon-]{font-size:12px;line-height:16px;margin-left:-3px;padding-left:0;padding-right:0}.monaco-dropdown-with-default>.dropdown-action-container>.monaco-dropdown>.dropdown-label>.action-label{background-position:50%;background-repeat:no-repeat;background-size:16px;display:block}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js

@@ -94,8 +94,9 @@ function fillInActions(groups, target, useAlternativeActions, isPrimaryAction =
     }
 }
 let MenuEntryActionViewItem = class MenuEntryActionViewItem extends ActionViewItem {
-    constructor(action, options, _keybindingService, _notificationService, _contextKeyService, _themeService, _contextMenuService, _accessibilityService) {
-        super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: options?.draggable, keybinding: options?.keybinding, hoverDelegate: options?.hoverDelegate });
+    constructor(action, _options, _keybindingService, _notificationService, _contextKeyService, _themeService, _contextMenuService, _accessibilityService) {
+        super(undefined, action, { icon: !!(action.class || action.item.icon), label: !action.class && !action.item.icon, draggable: _options?.draggable, keybinding: _options?.keybinding, hoverDelegate: _options?.hoverDelegate });
+        this._options = _options;
         this._keybindingService = _keybindingService;
         this._notificationService = _notificationService;
         this._contextKeyService = _contextKeyService;
@@ -234,6 +235,35 @@ MenuEntryActionViewItem = ( (__decorate([
     ( (__param(6, IContextMenuService))),
     ( (__param(7, IAccessibilityService)))
 ], MenuEntryActionViewItem)));
+class TextOnlyMenuEntryActionViewItem extends MenuEntryActionViewItem {
+    render(container) {
+        this.options.label = true;
+        this.options.icon = false;
+        super.render(container);
+        container.classList.add('text-only');
+        container.classList.toggle('use-comma', this._options?.useComma ?? false);
+    }
+    updateLabel() {
+        const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService);
+        if (!kb) {
+            return super.updateLabel();
+        }
+        if (this.label) {
+            const kb2 = TextOnlyMenuEntryActionViewItem._symbolPrintEnter(kb);
+            if (this._options?.conversational) {
+                this.label.textContent = ( localizeWithPath(_moduleId, 2, '{1} to {0}', this._action.label, kb2));
+            }
+            else {
+                this.label.textContent = ( localizeWithPath(_moduleId, 3, '{0} ({1})', this._action.label, kb2));
+            }
+        }
+    }
+    static _symbolPrintEnter(kb) {
+        return kb.getLabel()
+            ?.replace(/\benter\b/gi, '\u23CE')
+            .replace(/\bEscape\b/gi, 'Esc');
+    }
+}
 let SubmenuEntryActionViewItem = class SubmenuEntryActionViewItem extends DropdownMenuActionViewItem {
     constructor(action, options, _keybindingService, _contextMenuService, _themeService) {
         const dropdownOptions = {
@@ -453,4 +483,4 @@ function createActionViewItem(instaService, action, options) {
         return undefined;
     }
 }
-export { DropdownWithDefaultActionViewItem, MenuEntryActionViewItem, SubmenuEntryActionViewItem, createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions };
+export { DropdownWithDefaultActionViewItem, MenuEntryActionViewItem, SubmenuEntryActionViewItem, TextOnlyMenuEntryActionViewItem, createActionViewItem, createAndFillInActionBarActions, createAndFillInContextMenuActions };

package/vscode/src/vs/platform/actions/browser/toolbar.js

@@ -112,7 +112,8 @@ let WorkbenchToolBar = class WorkbenchToolBar extends ToolBar {
                     primaryActions.push(action.menuKeybinding);
                 }
                 else if (!(action instanceof SubmenuItemAction || action instanceof ToggleMenuAction)) {
-                    primaryActions.push(createConfigureKeybindingAction(action.id, undefined, this._commandService, this._keybindingService));
+                    const isDisabled = action.id.startsWith('statusbaraction');
+                    primaryActions.push(createConfigureKeybindingAction(this._commandService, this._keybindingService, action.id, undefined, !isDisabled));
                 }
                 if (toggleActions.length > 0) {
                     let noHide = false;

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

@@ -150,6 +150,8 @@ declare class MenuId {
     static readonly InteractiveCellDelete: MenuId;
     static readonly InteractiveCellExecute: MenuId;
     static readonly InteractiveInputExecute: MenuId;
+    static readonly InteractiveInputConfig: MenuId;
+    static readonly ReplInputExecute: MenuId;
     static readonly IssueReporter: MenuId;
     static readonly NotebookToolbar: MenuId;
     static readonly NotebookStickyScrollContext: MenuId;
@@ -188,6 +190,7 @@ declare class MenuId {
     static readonly TerminalStickyScrollContext: MenuId;
     static readonly WebviewContext: MenuId;
     static readonly InlineCompletionsActions: MenuId;
+    static readonly InlineEditsActions: MenuId;
     static readonly InlineEditActions: MenuId;
     static readonly NewFile: MenuId;
     static readonly MergeInput1Toolbar: MenuId;

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

@@ -139,6 +139,8 @@ class MenuId {
     static { this.InteractiveCellDelete = ( new MenuId('InteractiveCellDelete')); }
     static { this.InteractiveCellExecute = ( new MenuId('InteractiveCellExecute')); }
     static { this.InteractiveInputExecute = ( new MenuId('InteractiveInputExecute')); }
+    static { this.InteractiveInputConfig = ( new MenuId('InteractiveInputConfig')); }
+    static { this.ReplInputExecute = ( new MenuId('ReplInputExecute')); }
     static { this.IssueReporter = ( new MenuId('IssueReporter')); }
     static { this.NotebookToolbar = ( new MenuId('NotebookToolbar')); }
     static { this.NotebookStickyScrollContext = ( new MenuId('NotebookStickyScrollContext')); }
@@ -177,6 +179,7 @@ class MenuId {
     static { this.TerminalStickyScrollContext = ( new MenuId('TerminalStickyScrollContext')); }
     static { this.WebviewContext = ( new MenuId('WebviewContext')); }
     static { this.InlineCompletionsActions = ( new MenuId('InlineCompletionsActions')); }
+    static { this.InlineEditsActions = ( new MenuId('InlineEditsActions')); }
     static { this.InlineEditActions = ( new MenuId('InlineEditActions')); }
     static { this.NewFile = ( new MenuId('NewFile')); }
     static { this.MergeInput1Toolbar = ( new MenuId('MergeToolbar1Toolbar')); }

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

@@ -212,7 +212,7 @@ let MenuInfo = MenuInfo_1 = class MenuInfo {
                     }
                     const menuHide = createMenuHide(this._id, isMenuItem ? item.command : item, this._hiddenStates);
                     if (isMenuItem) {
-                        const menuKeybinding = createConfigureKeybindingAction(item.command.id, item.when, this._commandService, this._keybindingService);
+                        const menuKeybinding = createConfigureKeybindingAction(this._commandService, this._keybindingService, item.command.id, item.when);
                         (activeActions ??= []).push(( (new MenuItemAction(
                             item.command,
                             item.alt,
@@ -384,10 +384,11 @@ function createMenuHide(menu, command, states) {
         get isHidden() { return !toggle.checked; },
     };
 }
-function createConfigureKeybindingAction(commandId, when = undefined, commandService, keybindingService) {
+function createConfigureKeybindingAction(commandService, keybindingService, commandId, when = undefined, enabled = true) {
     return toAction({
         id: `configureKeybinding/${commandId}`,
         label: ( localizeWithPath(_moduleId, 1, "Configure Keybinding")),
+        enabled,
         run() {
             const hasKeybinding = !!keybindingService.lookupKeybinding(commandId);
             const whenValue = !hasKeybinding && when ? when.serialize() : undefined;

package/vscode/src/vs/platform/clipboard/browser/clipboardService.js

@@ -77,7 +77,7 @@ let BrowserClipboardService = class BrowserClipboardService extends Disposable {
         if (isHTMLElement(activeElement)) {
             activeElement.focus();
         }
-        activeDocument.body.removeChild(textArea);
+        textArea.remove();
     }
     async readText(type) {
         if (type) {

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

@@ -188,19 +188,21 @@ interface IConfigurationNode {
     extensionInfo?: IExtensionInfo;
     restrictedProperties?: string[];
 }
+type ConfigurationDefaultSource = IExtensionInfo | string;
+type ConfigurationDefaultValueSource = ConfigurationDefaultSource | Map<string, ConfigurationDefaultSource>;
 interface IConfigurationDefaults {
     overrides: IStringDictionary<any>;
-    source?: IExtensionInfo | string;
+    source?: ConfigurationDefaultSource;
 }
 type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchema & {
     defaultDefaultValue?: any;
     source?: IExtensionInfo;
-    defaultValueSource?: IExtensionInfo | string;
+    defaultValueSource?: ConfigurationDefaultValueSource;
 };
 type IConfigurationDefaultOverride = {
     readonly value: any;
-    readonly source?: IExtensionInfo | string;
-    readonly valuesSources?: Map<string, IExtensionInfo | string>;
+    readonly source?: ConfigurationDefaultValueSource;
+    readonly valuesSources?: Map<string, ConfigurationDefaultValueSource>;
 };
 
-export { ConfigurationScope, EditPresentationTypes, type IConfigurationDefaultOverride, type IConfigurationDefaults, type IConfigurationDelta, type IConfigurationNode, type IConfigurationPropertySchema, type IConfigurationRegistry, type IExtensionInfo, type IPolicy, type IRegisteredConfigurationPropertySchema };
+export { type ConfigurationDefaultSource, type ConfigurationDefaultValueSource, ConfigurationScope, EditPresentationTypes, type IConfigurationDefaultOverride, type IConfigurationDefaults, type IConfigurationDelta, type IConfigurationNode, type IConfigurationPropertySchema, type IConfigurationRegistry, type IExtensionInfo, type IPolicy, type IRegisteredConfigurationPropertySchema };

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

@@ -1,6 +1,6 @@
 import { distinct } from '../../../base/common/arrays.js';
 import { Emitter } from '../../../base/common/event.js';
-import { isUndefinedOrNull, isString, isUndefined } from '../../../base/common/types.js';
+import { isObject, isUndefinedOrNull, isUndefined, isString } from '../../../base/common/types.js';
 import { localizeWithPath } from '../../../nls.js';
 import { getLanguageTagSettingPlainKey } from './configuration.js';
 import { Extensions as Extensions$1 } from '../../jsonschemas/common/jsonContributionRegistry.js';
@@ -98,12 +98,34 @@ class ConfigurationRegistry {
                 if (OVERRIDE_PROPERTY_REGEX.test(key)) {
                     const configurationDefaultOverride = this.configurationDefaultsOverrides.get(key);
                     const valuesSources = configurationDefaultOverride?.valuesSources ?? ( (new Map()));
-                    if (source) {
-                        for (const configuration of ( (Object.keys(overrides[key])))) {
-                            valuesSources.set(configuration, source);
+                    const defaultValue = configurationDefaultOverride?.value || {};
+                    for (const configuration of ( (Object.keys(overrides[key])))) {
+                        const overrideValue = overrides[key][configuration];
+                        const isObjectSetting = isObject(overrideValue) && (isUndefined(defaultValue[configuration]) || isObject(defaultValue[configuration]));
+                        if (isObjectSetting) {
+                            defaultValue[configuration] = { ...(defaultValue[configuration] ?? {}), ...overrideValue };
+                            if (source) {
+                                let objectConfigurationSources = valuesSources.get(configuration);
+                                if (!objectConfigurationSources) {
+                                    objectConfigurationSources = ( (new Map()));
+                                    valuesSources.set(configuration, objectConfigurationSources);
+                                }
+                                if (!(objectConfigurationSources instanceof Map)) {
+                                    console.error('objectConfigurationSources is not a Map');
+                                    continue;
+                                }
+                                for (const objectKey in overrideValue) {
+                                    objectConfigurationSources.set(objectKey, source);
+                                }
+                            }
+                        }
+                        else {
+                            defaultValue[configuration] = overrideValue;
+                            if (source) {
+                                valuesSources.set(configuration, source);
+                            }
                         }
                     }
-                    const defaultValue = { ...(configurationDefaultOverride?.value || {}), ...overrides[key] };
                     this.configurationDefaultsOverrides.set(key, { source, value: defaultValue, valuesSources });
                     const plainKey = getLanguageTagSettingPlainKey(key);
                     const property = {
@@ -125,8 +147,33 @@ class ConfigurationRegistry {
                     this.defaultLanguageConfigurationOverridesNode.properties[key] = property;
                 }
                 else {
-                    this.configurationDefaultsOverrides.set(key, { value: overrides[key], source });
                     const property = this.configurationProperties[key];
+                    const existingDefaultOverride = this.configurationDefaultsOverrides.get(key);
+                    let existingDefaultValue = existingDefaultOverride?.value ?? property?.defaultDefaultValue;
+                    let newDefaultValue = overrides[key];
+                    let newDefaultValueSource = source;
+                    const isObjectSetting = isObject(newDefaultValue) && (property !== undefined && property.type === 'object' ||
+                        property === undefined && (isUndefined(existingDefaultValue) || isObject(existingDefaultValue)));
+                    if (isObjectSetting) {
+                        if (!isObject(existingDefaultValue)) {
+                            existingDefaultValue = {};
+                        }
+                        newDefaultValue = { ...existingDefaultValue, ...newDefaultValue };
+                        newDefaultValueSource = existingDefaultOverride?.source ?? ( (new Map()));
+                        if (!(newDefaultValueSource instanceof Map)) {
+                            console.error('defaultValueSource is not a Map');
+                            continue;
+                        }
+                        for (const overrideObjectKey in overrides[key]) {
+                            if (source) {
+                                newDefaultValueSource.set(overrideObjectKey, source);
+                            }
+                            else {
+                                newDefaultValueSource.delete(overrideObjectKey);
+                            }
+                        }
+                    }
+                    this.configurationDefaultsOverrides.set(key, { value: newDefaultValue, source: newDefaultValueSource });
                     if (property) {
                         this.updatePropertyDefaultValue(key, property);
                         this.updateSchema(key, property);
@@ -145,25 +192,74 @@ class ConfigurationRegistry {
     doDeregisterDefaultConfigurations(defaultConfigurations, bucket) {
         for (const { overrides, source } of defaultConfigurations) {
             for (const key in overrides) {
-                const configurationDefaultsOverride = this.configurationDefaultsOverrides.get(key);
                 const id = isString(source) ? source : source?.id;
-                const configurationDefaultsOverrideSourceId = isString(configurationDefaultsOverride?.source) ? configurationDefaultsOverride?.source : configurationDefaultsOverride?.source?.id;
-                if (id !== configurationDefaultsOverrideSourceId) {
+                const configurationDefaultsOverride = this.configurationDefaultsOverrides.get(key);
+                if (!configurationDefaultsOverride) {
                     continue;
                 }
-                bucket.add(key);
-                this.configurationDefaultsOverrides.delete(key);
                 if (OVERRIDE_PROPERTY_REGEX.test(key)) {
-                    delete this.configurationProperties[key];
-                    delete this.defaultLanguageConfigurationOverridesNode.properties[key];
+                    for (const configuration of ( (Object.keys(overrides[key])))) {
+                        const overrideValue = overrides[key][configuration];
+                        if (isObject(overrideValue)) {
+                            const configurationSource = configurationDefaultsOverride.valuesSources?.get(configuration);
+                            for (const overrideObjectKey of ( (Object.keys(overrideValue)))) {
+                                const keySource = configurationSource?.get(overrideObjectKey);
+                                const keySourceId = isString(keySource) ? keySource : keySource?.id;
+                                if (keySourceId === id) {
+                                    configurationSource?.delete(overrideObjectKey);
+                                    delete configurationDefaultsOverride.value[configuration][overrideObjectKey];
+                                }
+                            }
+                            if (( (Object.keys(configurationDefaultsOverride.value[configuration]))).length === 0) {
+                                delete configurationDefaultsOverride.value[configuration];
+                                configurationDefaultsOverride.valuesSources?.delete(configuration);
+                            }
+                        }
+                        else {
+                            const configurationSource = configurationDefaultsOverride.valuesSources?.get(configuration);
+                            const keySourceId = isString(configurationSource) ? configurationSource : configurationSource?.id;
+                            if (keySourceId === id) {
+                                configurationDefaultsOverride.valuesSources?.delete(configuration);
+                                delete configurationDefaultsOverride.value[configuration];
+                            }
+                        }
+                    }
+                    const languageValues = this.configurationDefaultsOverrides.get(key);
+                    if (languageValues && ( (Object.keys(languageValues.value))).length === 0) {
+                        this.configurationDefaultsOverrides.delete(key);
+                        delete this.configurationProperties[key];
+                        delete this.defaultLanguageConfigurationOverridesNode.properties[key];
+                    }
                 }
                 else {
+                    if (configurationDefaultsOverride.source instanceof Map) {
+                        const keySources = configurationDefaultsOverride.source;
+                        for (const objectKey in overrides[key]) {
+                            const keySource = keySources.get(objectKey);
+                            const keySourceId = isString(keySource) ? keySource : keySource?.id;
+                            if (keySourceId === id) {
+                                keySources.delete(objectKey);
+                                delete configurationDefaultsOverride.value[objectKey];
+                            }
+                        }
+                        if (keySources.size === 0) {
+                            this.configurationDefaultsOverrides.delete(key);
+                        }
+                    }
+                    else {
+                        const configurationDefaultsOverrideSourceId = isString(configurationDefaultsOverride.source) ? configurationDefaultsOverride.source : configurationDefaultsOverride.source?.id;
+                        if (id !== configurationDefaultsOverrideSourceId) {
+                            continue;
+                        }
+                        this.configurationDefaultsOverrides.delete(key);
+                    }
                     const property = this.configurationProperties[key];
                     if (property) {
                         this.updatePropertyDefaultValue(key, property);
                         this.updateSchema(key, property);
                     }
                 }
+                bucket.add(key);
             }
         }
         this.updateOverridePropertyPatternKey();

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

@@ -35,6 +35,8 @@ interface WorkspaceStats {
     fileCount: number;
     maxFilesReached: boolean;
     launchConfigFiles: WorkspaceStatItem[];
+    totalScanTime: number;
+    totalReaddirCount: number;
 }
 
 export type { IDiagnosticInfo, IDiagnosticInfoOptions, ILinuxEnv, IMachineInfo, WorkspaceStatItem, WorkspaceStats };

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

@@ -11,6 +11,7 @@ interface IGalleryExtensionProperties {
     dependencies?: string[];
     extensionPack?: string[];
     engine?: string;
+    enabledApiProposals?: string[];
     localizedLanguages?: string[];
     targetPlatform: TargetPlatform;
     isPreReleaseVersion: boolean;
@@ -124,6 +125,7 @@ interface IExtensionsControlManifest {
     readonly malicious: IExtensionIdentifier[];
     readonly deprecated: IStringDictionary<IDeprecationInfo>;
     readonly search: ISearchPrefferedResults[];
+    readonly extensionsEnabledWithPreRelease?: string[];
 }
 declare const enum InstallOperation {
     None = 1,
@@ -134,7 +136,7 @@ declare const enum InstallOperation {
 interface InstallExtensionEvent {
     readonly identifier: IExtensionIdentifier;
     readonly source: URI | IGalleryExtension;
-    readonly profileLocation?: URI;
+    readonly profileLocation: URI;
     readonly applicationScoped?: boolean;
     readonly workspaceScoped?: boolean;
 }
@@ -145,23 +147,27 @@ interface InstallExtensionResult {
     readonly local?: ILocalExtension;
     readonly error?: Error;
     readonly context?: IStringDictionary<any>;
-    readonly profileLocation?: URI;
+    readonly profileLocation: URI;
     readonly applicationScoped?: boolean;
     readonly workspaceScoped?: boolean;
 }
 interface UninstallExtensionEvent {
     readonly identifier: IExtensionIdentifier;
-    readonly profileLocation?: URI;
+    readonly profileLocation: URI;
     readonly applicationScoped?: boolean;
     readonly workspaceScoped?: boolean;
 }
 interface DidUninstallExtensionEvent {
     readonly identifier: IExtensionIdentifier;
     readonly error?: string;
-    readonly profileLocation?: URI;
+    readonly profileLocation: URI;
     readonly applicationScoped?: boolean;
     readonly workspaceScoped?: boolean;
 }
+interface DidUpdateExtensionMetadata {
+    readonly profileLocation: URI;
+    readonly local: ILocalExtension;
+}
 type InstallOptions = {
     isBuiltin?: boolean;
     isWorkspaceScoped?: boolean;
@@ -183,11 +189,11 @@ type InstallOptions = {
     context?: IStringDictionary<any>;
 };
 type UninstallOptions = {
+    readonly profileLocation?: URI;
     readonly donotIncludePack?: boolean;
     readonly donotCheckDependents?: boolean;
     readonly versionOnly?: boolean;
     readonly remove?: boolean;
-    readonly profileLocation?: URI;
 };
 interface IExtensionManagementParticipant {
     postInstall(local: ILocalExtension, source: URI | IGalleryExtension, options: InstallOptions, token: CancellationToken): Promise<void>;
@@ -198,4 +204,4 @@ type InstallExtensionInfo = {
     readonly options: InstallOptions;
 };
 
-export { type DidUninstallExtensionEvent, type IDeprecationInfo, type IExtensionIdentifier, type IExtensionManagementParticipant, type IExtensionsControlManifest, type IGalleryExtension, type IGalleryExtensionAsset, type IGalleryExtensionAssets, type IGalleryExtensionIdentifier, type IGalleryExtensionProperties, type IGalleryMetadata, type ILocalExtension, type IProductVersion, type ISearchPrefferedResults, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, InstallOperation, type InstallOptions, type InstallSource, type Metadata, type UninstallExtensionEvent, type UninstallOptions };
+export { type DidUninstallExtensionEvent, type DidUpdateExtensionMetadata, type IDeprecationInfo, type IExtensionIdentifier, type IExtensionManagementParticipant, type IExtensionsControlManifest, type IGalleryExtension, type IGalleryExtensionAsset, type IGalleryExtensionAssets, type IGalleryExtensionIdentifier, type IGalleryExtensionProperties, type IGalleryMetadata, type ILocalExtension, type IProductVersion, type ISearchPrefferedResults, type InstallExtensionEvent, type InstallExtensionInfo, type InstallExtensionResult, InstallOperation, type InstallOptions, type InstallSource, type Metadata, type UninstallExtensionEvent, type UninstallOptions };

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

@@ -162,12 +162,14 @@ var ExtensionManagementErrorCode;
     ExtensionManagementErrorCode["Deprecated"] = "Deprecated";
     ExtensionManagementErrorCode["Malicious"] = "Malicious";
     ExtensionManagementErrorCode["Incompatible"] = "Incompatible";
+    ExtensionManagementErrorCode["IncompatibleApi"] = "IncompatibleApi";
     ExtensionManagementErrorCode["IncompatibleTargetPlatform"] = "IncompatibleTargetPlatform";
     ExtensionManagementErrorCode["ReleaseVersionNotFound"] = "ReleaseVersionNotFound";
     ExtensionManagementErrorCode["Invalid"] = "Invalid";
     ExtensionManagementErrorCode["Download"] = "Download";
     ExtensionManagementErrorCode["DownloadSignature"] = "DownloadSignature";
     ExtensionManagementErrorCode["DownloadFailedWriting"] = "DownloadFailedWriting";
+    ExtensionManagementErrorCode["UpdateExistingMetadata"] = "UpdateExistingMetadata";
     ExtensionManagementErrorCode["UpdateMetadata"] = "UpdateMetadata";
     ExtensionManagementErrorCode["Extract"] = "Extract";
     ExtensionManagementErrorCode["Scanning"] = "Scanning";

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

@@ -1,7 +1,7 @@
 import { ServiceIdentifier } from '../../instantiation/common/instantiation.js';
 import { URI } from '../../../base/common/uri.js';
 import { IExtensionManifest, ExtensionType, TargetPlatform } from '../../extensions/common/extensions.js';
-import { InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUninstallExtensionEvent, ILocalExtension, IExtensionIdentifier, InstallOptions, IGalleryExtension, InstallExtensionInfo, UninstallOptions, IProductVersion, IExtensionsControlManifest, Metadata, InstallOperation, IExtensionManagementParticipant } from './extensionManagement.js';
+import { InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUninstallExtensionEvent, DidUpdateExtensionMetadata, ILocalExtension, IExtensionIdentifier, InstallOptions, IGalleryExtension, InstallExtensionInfo, UninstallOptions, IProductVersion, IExtensionsControlManifest, Metadata, InstallOperation, IExtensionManagementParticipant } from './extensionManagement.js';
 import { Event } from '../../../base/common/event.js';
 
 declare const IExtensionManagementService: ServiceIdentifier<IExtensionManagementService>;
@@ -11,7 +11,7 @@ interface IExtensionManagementService {
     onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
     onUninstallExtension: Event<UninstallExtensionEvent>;
     onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
-    onDidUpdateExtensionMetadata: Event<ILocalExtension>;
+    onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
     zip(extension: ILocalExtension): Promise<URI>;
     unzip(zipLocation: URI): Promise<IExtensionIdentifier>;
     getManifest(vsix: URI): Promise<IExtensionManifest>;
@@ -27,7 +27,7 @@ interface IExtensionManagementService {
     getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
     getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
     copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;
-    updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation?: URI): Promise<ILocalExtension>;
+    updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<ILocalExtension>;
     download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI>;
     registerParticipant(pariticipant: IExtensionManagementParticipant): void;
     getTargetPlatform(): Promise<TargetPlatform>;

package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js

@@ -18,7 +18,7 @@ import { URI } from '../../../base/common/uri.js';
 import { localizeWithPath } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.service.js';
 import { computeTargetPlatform, areSameExtensions, ExtensionKey, getGalleryExtensionId } from './extensionManagementUtil.js';
-import { ExtensionType, UNDEFINED_PUBLISHER, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, TargetPlatform } from '../../extensions/common/extensions.js';
+import { ExtensionType, UNDEFINED_PUBLISHER, parseEnabledApiProposalNames, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, TargetPlatform } from '../../extensions/common/extensions.js';
 import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
 import { toFileOperationResult, FileOperationResult } from '../../files/common/files.js';
 import { IFileService } from '../../files/common/files.service.js';
@@ -609,11 +609,12 @@ ExtensionManifestTranslator = ( (__decorate([
     ( (__param(1, ILogService)))
 ], ExtensionManifestTranslator)));
 let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTranslator {
-    constructor(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, logService) {
+    constructor(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService) {
         super(fileService, logService);
         this.obsoleteFile = obsoleteFile;
         this.extensionsProfileScannerService = extensionsProfileScannerService;
         this.uriIdentityService = uriIdentityService;
+        this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
     }
     async scanExtensions(input) {
         const extensions = input.profile ? await this.scanExtensionsFromProfile(input) : await this.scanExtensionsFromLocation(input);
@@ -729,7 +730,7 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                 const type = metadata?.isSystem ? ExtensionType.System : input.type;
                 const isBuiltin = type === ExtensionType.System || !!metadata?.isBuiltin;
                 manifest = await this.translateManifest(input.location, manifest, ExtensionScannerInput.createNlsConfiguration(input));
-                const extension = {
+                let extension = {
                     type,
                     identifier,
                     manifest,
@@ -741,7 +742,13 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
                     isValid: true,
                     validations: []
                 };
-                return input.validate ? this.validate(extension, input) : extension;
+                if (input.validate) {
+                    extension = this.validate(extension, input);
+                }
+                if (manifest.enabledApiProposals && this.extensionsEnabledWithApiProposalVersion.includes(id.toLowerCase())) {
+                    manifest.enabledApiProposals = parseEnabledApiProposalNames([...manifest.enabledApiProposals]);
+                }
+                return extension;
             }
         }
         catch (e) {
@@ -753,7 +760,8 @@ let ExtensionsScanner = class ExtensionsScanner extends ExtensionManifestTransla
     }
     validate(extension, input) {
         let isValid = true;
-        const validations = validateExtensionManifest(input.productVersion, input.productDate, input.location, extension.manifest, extension.isBuiltin);
+        const validateApiVersion = this.extensionsEnabledWithApiProposalVersion.includes(extension.identifier.id.toLowerCase());
+        const validations = validateExtensionManifest(input.productVersion, input.productDate, input.location, extension.manifest, extension.isBuiltin, validateApiVersion);
         for (const [severity, message] of validations) {
             if (severity === Severity$1.Error) {
                 isValid = false;
@@ -818,11 +826,12 @@ ExtensionsScanner = ( (__decorate([
     ( (__param(1, IExtensionsProfileScannerService))),
     ( (__param(2, IUriIdentityService))),
     ( (__param(3, IFileService))),
-    ( (__param(4, ILogService)))
+    ( (__param(4, IProductService))),
+    ( (__param(5, ILogService)))
 ], ExtensionsScanner)));
 let CachedExtensionsScanner = class CachedExtensionsScanner extends ExtensionsScanner {
-    constructor(currentProfile, obsoleteFile, userDataProfilesService, extensionsProfileScannerService, uriIdentityService, fileService, logService) {
-        super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, logService);
+    constructor(currentProfile, obsoleteFile, userDataProfilesService, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService) {
+        super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, logService);
         this.currentProfile = currentProfile;
         this.userDataProfilesService = userDataProfilesService;
         this.cacheValidatorThrottler = this._register(( (new ThrottledDelayer(3000))));
@@ -834,7 +843,7 @@ let CachedExtensionsScanner = class CachedExtensionsScanner extends ExtensionsSc
         const cacheContents = await this.readExtensionCache(cacheFile);
         this.input = input;
         if (cacheContents && cacheContents.input && ExtensionScannerInput.equals(cacheContents.input, this.input)) {
-            this.logService.debug('Using cached extensions scan result', ( (input.location.toString())));
+            this.logService.debug('Using cached extensions scan result', input.type === ExtensionType.System ? 'system' : 'user', ( (input.location.toString())));
             this.cacheValidatorThrottler.trigger(() => this.validateCache());
             return (
                  (cacheContents.result.map((extension) => {
@@ -911,6 +920,7 @@ CachedExtensionsScanner = ( (__decorate([
     ( (__param(3, IExtensionsProfileScannerService))),
     ( (__param(4, IUriIdentityService))),
     ( (__param(5, IFileService))),
-    ( (__param(6, ILogService)))
+    ( (__param(6, IProductService))),
+    ( (__param(7, ILogService)))
 ], CachedExtensionsScanner)));
 export { AbstractExtensionsScannerService, ExtensionManifestTranslator, ExtensionScannerInput, Translations };