@codingame/monaco-vscode-api 2.2.1 → 3.0.0

package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js

@@ -3,7 +3,7 @@ import { addDisposableListener, EventType, trackFocus, $ } from '../../../base/b
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import './actionWidget.css.js';
-import { localizeWithPath } from '../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../nls.js';
 import { acceptSelectedActionCommand, previewSelectedActionCommand, ActionList } from './actionList.js';
 import { registerAction2, Action2 } from '../../actions/common/actions.js';
 import { RawContextKey, IContextKeyService } from '../../contextkey/common/contextkey.js';
@@ -126,14 +126,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'hideCodeActionWidget',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/platform/actionWidget/browser/actionWidget',
-                    'hideCodeActionWidget.title',
-                    "Hide action widget"
-                )),
-                original: 'Hide action widget'
-            },
+            title: ( localize2WithPath(
+                'vs/platform/actionWidget/browser/actionWidget',
+                'hideCodeActionWidget.title',
+                "Hide action widget"
+            )),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -150,14 +147,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectPrevCodeAction',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/platform/actionWidget/browser/actionWidget',
-                    'selectPrevCodeAction.title',
-                    "Select previous action"
-                )),
-                original: 'Select previous action'
-            },
+            title: ( localize2WithPath(
+                'vs/platform/actionWidget/browser/actionWidget',
+                'selectPrevCodeAction.title',
+                "Select previous action"
+            )),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -178,14 +172,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'selectNextCodeAction',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/platform/actionWidget/browser/actionWidget',
-                    'selectNextCodeAction.title',
-                    "Select next action"
-                )),
-                original: 'Select next action'
-            },
+            title: ( localize2WithPath(
+                'vs/platform/actionWidget/browser/actionWidget',
+                'selectNextCodeAction.title',
+                "Select next action"
+            )),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -206,14 +197,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: acceptSelectedActionCommand,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/platform/actionWidget/browser/actionWidget',
-                    'acceptSelected.title',
-                    "Accept selected action"
-                )),
-                original: 'Accept selected action'
-            },
+            title: ( localize2WithPath(
+                'vs/platform/actionWidget/browser/actionWidget',
+                'acceptSelected.title',
+                "Accept selected action"
+            )),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,
@@ -233,14 +221,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: previewSelectedActionCommand,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/platform/actionWidget/browser/actionWidget',
-                    'previewSelected.title',
-                    "Preview selected action"
-                )),
-                original: 'Preview selected action'
-            },
+            title: ( localize2WithPath(
+                'vs/platform/actionWidget/browser/actionWidget',
+                'previewSelected.title',
+                "Preview selected action"
+            )),
             precondition: ActionWidgetContextKeys.Visible,
             keybinding: {
                 weight,

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

@@ -14,14 +14,14 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
         return this._dropdown.onDidChangeVisibility;
     }
     constructor(primaryAction, dropdownAction, dropdownMenuActions, className, _contextMenuProvider, _options, _keybindingService, _notificationService, _contextKeyService, _themeService, _accessibilityService) {
-        super(null, primaryAction);
+        super(null, primaryAction, { hoverDelegate: _options?.hoverDelegate });
         this._contextMenuProvider = _contextMenuProvider;
         this._options = _options;
         this._container = null;
         this._dropdownContainer = null;
         this._primaryAction = ( new MenuEntryActionViewItem(
             primaryAction,
-            undefined,
+            { hoverDelegate: _options?.hoverDelegate },
             _keybindingService,
             _notificationService,
             _contextKeyService,
@@ -36,7 +36,8 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
             menuAsChild: true,
             classNames: className ? ['codicon', 'codicon-chevron-down', className] : ['codicon', 'codicon-chevron-down'],
             actionRunner: this._options?.actionRunner,
-            keybindingProvider: this._options?.getKeyBinding
+            keybindingProvider: this._options?.getKeyBinding,
+            hoverDelegate: _options?.hoverDelegate
         }));
     }
     setActionContext(newContext) {
@@ -102,7 +103,8 @@ let DropdownWithPrimaryActionViewItem = class DropdownWithPrimaryActionViewItem
         this._dropdown.dispose();
         this._dropdown = ( new DropdownMenuActionViewItem(dropdownAction, dropdownMenuActions, this._contextMenuProvider, {
             menuAsChild: true,
-            classNames: ['codicon', dropdownIcon || 'codicon-chevron-down']
+            classNames: ['codicon', dropdownIcon || 'codicon-chevron-down'],
+            hoverDelegate: this._options?.hoverDelegate
         }));
         if (this._dropdownContainer) {
             this._dropdown.render(this._dropdownContainer);

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

@@ -31,6 +31,7 @@ declare class MenuId {
     static readonly DebugCallStackContext: MenuId;
     static readonly DebugConsoleContext: MenuId;
     static readonly DebugVariablesContext: MenuId;
+    static readonly NotebookVariablesContext: MenuId;
     static readonly DebugHoverContext: MenuId;
     static readonly DebugWatchContext: MenuId;
     static readonly DebugToolBar: MenuId;
@@ -86,8 +87,13 @@ declare class MenuId {
     static readonly OpenEditorsContextShare: MenuId;
     static readonly ProblemsPanelContext: MenuId;
     static readonly SCMInputBox: MenuId;
+    static readonly SCMChangesSeparator: MenuId;
     static readonly SCMIncomingChanges: MenuId;
+    static readonly SCMIncomingChangesContext: MenuId;
+    static readonly SCMIncomingChangesSetting: MenuId;
     static readonly SCMOutgoingChanges: MenuId;
+    static readonly SCMOutgoingChangesContext: MenuId;
+    static readonly SCMOutgoingChangesSetting: MenuId;
     static readonly SCMIncomingChangesAllChangesContext: MenuId;
     static readonly SCMIncomingChangesHistoryItemContext: MenuId;
     static readonly SCMOutgoingChangesAllChangesContext: MenuId;
@@ -99,6 +105,7 @@ declare class MenuId {
     static readonly SCMResourceGroupContext: MenuId;
     static readonly SCMSourceControl: MenuId;
     static readonly SCMSourceControlInline: MenuId;
+    static readonly SCMSourceControlTitle: MenuId;
     static readonly SCMTitle: MenuId;
     static readonly SearchContext: MenuId;
     static readonly SearchActionMenu: MenuId;
@@ -139,6 +146,7 @@ declare class MenuId {
     static readonly InteractiveCellDelete: MenuId;
     static readonly InteractiveCellExecute: MenuId;
     static readonly InteractiveInputExecute: MenuId;
+    static readonly IssueReporter: MenuId;
     static readonly NotebookToolbar: MenuId;
     static readonly NotebookStickyScrollContext: MenuId;
     static readonly NotebookCellTitle: MenuId;
@@ -147,6 +155,7 @@ declare class MenuId {
     static readonly NotebookCellBetween: MenuId;
     static readonly NotebookCellListTop: MenuId;
     static readonly NotebookCellExecute: MenuId;
+    static readonly NotebookCellExecuteGoTo: MenuId;
     static readonly NotebookCellExecutePrimary: MenuId;
     static readonly NotebookDiffCellInputTitle: MenuId;
     static readonly NotebookDiffCellMetadataTitle: MenuId;
@@ -172,12 +181,14 @@ declare class MenuId {
     static readonly TerminalStickyScrollContext: MenuId;
     static readonly WebviewContext: MenuId;
     static readonly InlineCompletionsActions: MenuId;
+    static readonly InlineEditActions: MenuId;
     static readonly NewFile: MenuId;
     static readonly MergeInput1Toolbar: MenuId;
     static readonly MergeInput2Toolbar: MenuId;
     static readonly MergeBaseToolbar: MenuId;
     static readonly MergeInputResultToolbar: MenuId;
     static readonly InlineSuggestionToolbar: MenuId;
+    static readonly InlineEditToolbar: MenuId;
     static readonly ChatContext: MenuId;
     static readonly ChatCodeBlock: MenuId;
     static readonly ChatMessageTitle: MenuId;

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

@@ -22,6 +22,7 @@ class MenuId {
     static { this.DebugCallStackContext = ( new MenuId('DebugCallStackContext')); }
     static { this.DebugConsoleContext = ( new MenuId('DebugConsoleContext')); }
     static { this.DebugVariablesContext = ( new MenuId('DebugVariablesContext')); }
+    static { this.NotebookVariablesContext = ( new MenuId('NotebookVariablesContext')); }
     static { this.DebugHoverContext = ( new MenuId('DebugHoverContext')); }
     static { this.DebugWatchContext = ( new MenuId('DebugWatchContext')); }
     static { this.DebugToolBar = ( new MenuId('DebugToolBar')); }
@@ -77,8 +78,13 @@ class MenuId {
     static { this.OpenEditorsContextShare = ( new MenuId('OpenEditorsContextShare')); }
     static { this.ProblemsPanelContext = ( new MenuId('ProblemsPanelContext')); }
     static { this.SCMInputBox = ( new MenuId('SCMInputBox')); }
+    static { this.SCMChangesSeparator = ( new MenuId('SCMChangesSeparator')); }
     static { this.SCMIncomingChanges = ( new MenuId('SCMIncomingChanges')); }
+    static { this.SCMIncomingChangesContext = ( new MenuId('SCMIncomingChangesContext')); }
+    static { this.SCMIncomingChangesSetting = ( new MenuId('SCMIncomingChangesSetting')); }
     static { this.SCMOutgoingChanges = ( new MenuId('SCMOutgoingChanges')); }
+    static { this.SCMOutgoingChangesContext = ( new MenuId('SCMOutgoingChangesContext')); }
+    static { this.SCMOutgoingChangesSetting = ( new MenuId('SCMOutgoingChangesSetting')); }
     static { this.SCMIncomingChangesAllChangesContext = ( new MenuId('SCMIncomingChangesAllChangesContext')); }
     static { this.SCMIncomingChangesHistoryItemContext = ( new MenuId('SCMIncomingChangesHistoryItemContext')); }
     static { this.SCMOutgoingChangesAllChangesContext = ( new MenuId('SCMOutgoingChangesAllChangesContext')); }
@@ -90,6 +96,7 @@ class MenuId {
     static { this.SCMResourceGroupContext = ( new MenuId('SCMResourceGroupContext')); }
     static { this.SCMSourceControl = ( new MenuId('SCMSourceControl')); }
     static { this.SCMSourceControlInline = ( new MenuId('SCMSourceControlInline')); }
+    static { this.SCMSourceControlTitle = ( new MenuId('SCMSourceControlTitle')); }
     static { this.SCMTitle = ( new MenuId('SCMTitle')); }
     static { this.SearchContext = ( new MenuId('SearchContext')); }
     static { this.SearchActionMenu = ( new MenuId('SearchActionContext')); }
@@ -130,6 +137,7 @@ class MenuId {
     static { this.InteractiveCellDelete = ( new MenuId('InteractiveCellDelete')); }
     static { this.InteractiveCellExecute = ( new MenuId('InteractiveCellExecute')); }
     static { this.InteractiveInputExecute = ( new MenuId('InteractiveInputExecute')); }
+    static { this.IssueReporter = ( new MenuId('IssueReporter')); }
     static { this.NotebookToolbar = ( new MenuId('NotebookToolbar')); }
     static { this.NotebookStickyScrollContext = ( new MenuId('NotebookStickyScrollContext')); }
     static { this.NotebookCellTitle = ( new MenuId('NotebookCellTitle')); }
@@ -138,6 +146,7 @@ class MenuId {
     static { this.NotebookCellBetween = ( new MenuId('NotebookCellBetween')); }
     static { this.NotebookCellListTop = ( new MenuId('NotebookCellTop')); }
     static { this.NotebookCellExecute = ( new MenuId('NotebookCellExecute')); }
+    static { this.NotebookCellExecuteGoTo = ( new MenuId('NotebookCellExecuteGoTo')); }
     static { this.NotebookCellExecutePrimary = ( new MenuId('NotebookCellExecutePrimary')); }
     static { this.NotebookDiffCellInputTitle = ( new MenuId('NotebookDiffCellInputTitle')); }
     static { this.NotebookDiffCellMetadataTitle = ( new MenuId('NotebookDiffCellMetadataTitle')); }
@@ -163,12 +172,14 @@ class MenuId {
     static { this.TerminalStickyScrollContext = ( new MenuId('TerminalStickyScrollContext')); }
     static { this.WebviewContext = ( new MenuId('WebviewContext')); }
     static { this.InlineCompletionsActions = ( new MenuId('InlineCompletionsActions')); }
+    static { this.InlineEditActions = ( new MenuId('InlineEditActions')); }
     static { this.NewFile = ( new MenuId('NewFile')); }
     static { this.MergeInput1Toolbar = ( new MenuId('MergeToolbar1Toolbar')); }
     static { this.MergeInput2Toolbar = ( new MenuId('MergeToolbar2Toolbar')); }
     static { this.MergeBaseToolbar = ( new MenuId('MergeBaseToolbar')); }
     static { this.MergeInputResultToolbar = ( new MenuId('MergeToolbarResultToolbar')); }
     static { this.InlineSuggestionToolbar = ( new MenuId('InlineSuggestionToolbar')); }
+    static { this.InlineEditToolbar = ( new MenuId('InlineEditToolbar')); }
     static { this.ChatContext = ( new MenuId('ChatContext')); }
     static { this.ChatCodeBlock = ( new MenuId('ChatCodeblock')); }
     static { this.ChatMessageTitle = ( new MenuId('ChatMessageTitle')); }

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

@@ -30,6 +30,14 @@ interface IConfigurationChangeEvent {
     readonly change: IConfigurationChange;
     affectsConfiguration(configuration: string, overrides?: IConfigurationOverrides): boolean;
 }
+interface IInspectValue<T> {
+    readonly value?: T;
+    readonly override?: T;
+    readonly overrides?: {
+        readonly identifiers: string[];
+        readonly value: T;
+    }[];
+}
 interface IConfigurationValue<T> {
     readonly defaultValue?: T;
     readonly applicationValue?: T;
@@ -41,38 +49,14 @@ interface IConfigurationValue<T> {
     readonly memoryValue?: T;
     readonly policyValue?: T;
     readonly value?: T;
-    readonly default?: {
-        value?: T;
-        override?: T;
-    };
-    readonly application?: {
-        value?: T;
-        override?: T;
-    };
-    readonly user?: {
-        value?: T;
-        override?: T;
-    };
-    readonly userLocal?: {
-        value?: T;
-        override?: T;
-    };
-    readonly userRemote?: {
-        value?: T;
-        override?: T;
-    };
-    readonly workspace?: {
-        value?: T;
-        override?: T;
-    };
-    readonly workspaceFolder?: {
-        value?: T;
-        override?: T;
-    };
-    readonly memory?: {
-        value?: T;
-        override?: T;
-    };
+    readonly default?: IInspectValue<T>;
+    readonly application?: IInspectValue<T>;
+    readonly user?: IInspectValue<T>;
+    readonly userLocal?: IInspectValue<T>;
+    readonly userRemote?: IInspectValue<T>;
+    readonly workspace?: IInspectValue<T>;
+    readonly workspaceFolder?: IInspectValue<T>;
+    readonly memory?: IInspectValue<T>;
     readonly policy?: {
         value?: T;
     };
@@ -157,4 +141,4 @@ interface IConfigurationData {
     folders: [UriComponents, IConfigurationModel][];
 }
 
-export { ConfigurationTarget, type IConfigurationChange, type IConfigurationChangeEvent, type IConfigurationData, type IConfigurationModel, type IConfigurationOverrides, IConfigurationService, type IConfigurationUpdateOptions, type IConfigurationUpdateOverrides, type IConfigurationValue, type IOverrides };
+export { ConfigurationTarget, type IConfigurationChange, type IConfigurationChangeEvent, type IConfigurationData, type IConfigurationModel, type IConfigurationOverrides, IConfigurationService, type IConfigurationUpdateOptions, type IConfigurationUpdateOverrides, type IConfigurationValue, type IInspectValue, type IOverrides };

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

@@ -3,7 +3,7 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { visit } from '../../../base/common/json.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { ResourceMap, getOrSet } from '../../../base/common/map.js';
-import { deepClone, equals as equals$1, deepFreeze } from '../../../base/common/objects.js';
+import { deepClone, deepFreeze, equals as equals$1 } from '../../../base/common/objects.js';
 import { isObject, isUndefinedOrNull } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { getConfigurationValue, removeFromValueTree, addToValueTree, toValuesTree } from './configuration.js';
@@ -55,10 +55,28 @@ class ConfigurationModel {
         return section ? getConfigurationValue(this.contents, section) : this.contents;
     }
     inspect(section, overrideIdentifier) {
-        const value = this.rawConfiguration.getValue(section);
-        const override = overrideIdentifier ? this.rawConfiguration.getOverrideValue(section, overrideIdentifier) : undefined;
-        const merged = overrideIdentifier ? this.rawConfiguration.override(overrideIdentifier).getValue(section) : value;
-        return { value, override, merged };
+        const that = this;
+        return {
+            get value() {
+                return freeze(that.rawConfiguration.getValue(section));
+            },
+            get override() {
+                return overrideIdentifier ? freeze(that.rawConfiguration.getOverrideValue(section, overrideIdentifier)) : undefined;
+            },
+            get merged() {
+                return freeze(overrideIdentifier ? that.rawConfiguration.override(overrideIdentifier).getValue(section) : that.rawConfiguration.getValue(section));
+            },
+            get overrides() {
+                const overrides = [];
+                for (const { contents, identifiers, keys } of that.rawConfiguration.overrides) {
+                    const value = ( new ConfigurationModel(contents, keys)).getValue(section);
+                    if (value !== undefined) {
+                        overrides.push({ identifiers, value });
+                    }
+                }
+                return overrides.length ? freeze(overrides) : undefined;
+            }
+        };
     }
     getOverrideValue(section, overrideIdentifier) {
         const overrideContents = this.getContentsForOverrideIdentifer(overrideIdentifier);
@@ -426,17 +444,12 @@ class ConfigurationInspectValue {
     get value() {
         return freeze(this._value);
     }
-    inspect(model, section, overrideIdentifier) {
-        const inspectValue = model.inspect(section, overrideIdentifier);
-        return {
-            get value() { return freeze(inspectValue.value); },
-            get override() { return freeze(inspectValue.override); },
-            get merged() { return freeze(inspectValue.merged); }
-        };
+    toInspectValue(inspectValue) {
+        return inspectValue?.value !== undefined || inspectValue?.override !== undefined || inspectValue?.overrides !== undefined ? inspectValue : undefined;
     }
     get defaultInspectValue() {
         if (!this._defaultInspectValue) {
-            this._defaultInspectValue = this.inspect(this.defaultConfiguration, this.key, this.overrides.overrideIdentifier);
+            this._defaultInspectValue = this.defaultConfiguration.inspect(this.key, this.overrides.overrideIdentifier);
         }
         return this._defaultInspectValue;
     }
@@ -444,11 +457,11 @@ class ConfigurationInspectValue {
         return this.defaultInspectValue.merged;
     }
     get default() {
-        return this.defaultInspectValue.value !== undefined || this.defaultInspectValue.override !== undefined ? { value: this.defaultInspectValue.value, override: this.defaultInspectValue.override } : undefined;
+        return this.toInspectValue(this.defaultInspectValue);
     }
     get policyInspectValue() {
         if (this._policyInspectValue === undefined) {
-            this._policyInspectValue = this.policyConfiguration ? this.inspect(this.policyConfiguration, this.key) : null;
+            this._policyInspectValue = this.policyConfiguration ? this.policyConfiguration.inspect(this.key) : null;
         }
         return this._policyInspectValue;
     }
@@ -460,7 +473,7 @@ class ConfigurationInspectValue {
     }
     get applicationInspectValue() {
         if (this._applicationInspectValue === undefined) {
-            this._applicationInspectValue = this.applicationConfiguration ? this.inspect(this.applicationConfiguration, this.key) : null;
+            this._applicationInspectValue = this.applicationConfiguration ? this.applicationConfiguration.inspect(this.key) : null;
         }
         return this._applicationInspectValue;
     }
@@ -468,11 +481,11 @@ class ConfigurationInspectValue {
         return this.applicationInspectValue?.merged;
     }
     get application() {
-        return this.applicationInspectValue?.value !== undefined || this.applicationInspectValue?.override !== undefined ? { value: this.applicationInspectValue.value, override: this.applicationInspectValue.override } : undefined;
+        return this.toInspectValue(this.applicationInspectValue);
     }
     get userInspectValue() {
         if (!this._userInspectValue) {
-            this._userInspectValue = this.inspect(this.userConfiguration, this.key, this.overrides.overrideIdentifier);
+            this._userInspectValue = this.userConfiguration.inspect(this.key, this.overrides.overrideIdentifier);
         }
         return this._userInspectValue;
     }
@@ -480,11 +493,11 @@ class ConfigurationInspectValue {
         return this.userInspectValue.merged;
     }
     get user() {
-        return this.userInspectValue.value !== undefined || this.userInspectValue.override !== undefined ? { value: this.userInspectValue.value, override: this.userInspectValue.override } : undefined;
+        return this.toInspectValue(this.userInspectValue);
     }
     get userLocalInspectValue() {
         if (!this._userLocalInspectValue) {
-            this._userLocalInspectValue = this.inspect(this.localUserConfiguration, this.key, this.overrides.overrideIdentifier);
+            this._userLocalInspectValue = this.localUserConfiguration.inspect(this.key, this.overrides.overrideIdentifier);
         }
         return this._userLocalInspectValue;
     }
@@ -492,11 +505,11 @@ class ConfigurationInspectValue {
         return this.userLocalInspectValue.merged;
     }
     get userLocal() {
-        return this.userLocalInspectValue.value !== undefined || this.userLocalInspectValue.override !== undefined ? { value: this.userLocalInspectValue.value, override: this.userLocalInspectValue.override } : undefined;
+        return this.toInspectValue(this.userLocalInspectValue);
     }
     get userRemoteInspectValue() {
         if (!this._userRemoteInspectValue) {
-            this._userRemoteInspectValue = this.inspect(this.remoteUserConfiguration, this.key, this.overrides.overrideIdentifier);
+            this._userRemoteInspectValue = this.remoteUserConfiguration.inspect(this.key, this.overrides.overrideIdentifier);
         }
         return this._userRemoteInspectValue;
     }
@@ -504,11 +517,11 @@ class ConfigurationInspectValue {
         return this.userRemoteInspectValue.merged;
     }
     get userRemote() {
-        return this.userRemoteInspectValue.value !== undefined || this.userRemoteInspectValue.override !== undefined ? { value: this.userRemoteInspectValue.value, override: this.userRemoteInspectValue.override } : undefined;
+        return this.toInspectValue(this.userRemoteInspectValue);
     }
     get workspaceInspectValue() {
         if (this._workspaceInspectValue === undefined) {
-            this._workspaceInspectValue = this.workspaceConfiguration ? this.inspect(this.workspaceConfiguration, this.key, this.overrides.overrideIdentifier) : null;
+            this._workspaceInspectValue = this.workspaceConfiguration ? this.workspaceConfiguration.inspect(this.key, this.overrides.overrideIdentifier) : null;
         }
         return this._workspaceInspectValue;
     }
@@ -516,11 +529,11 @@ class ConfigurationInspectValue {
         return this.workspaceInspectValue?.merged;
     }
     get workspace() {
-        return this.workspaceInspectValue?.value !== undefined || this.workspaceInspectValue?.override !== undefined ? { value: this.workspaceInspectValue.value, override: this.workspaceInspectValue.override } : undefined;
+        return this.toInspectValue(this.workspaceInspectValue);
     }
     get workspaceFolderInspectValue() {
         if (this._workspaceFolderInspectValue === undefined) {
-            this._workspaceFolderInspectValue = this.folderConfigurationModel ? this.inspect(this.folderConfigurationModel, this.key, this.overrides.overrideIdentifier) : null;
+            this._workspaceFolderInspectValue = this.folderConfigurationModel ? this.folderConfigurationModel.inspect(this.key, this.overrides.overrideIdentifier) : null;
         }
         return this._workspaceFolderInspectValue;
     }
@@ -528,11 +541,11 @@ class ConfigurationInspectValue {
         return this.workspaceFolderInspectValue?.merged;
     }
     get workspaceFolder() {
-        return this.workspaceFolderInspectValue?.value !== undefined || this.workspaceFolderInspectValue?.override !== undefined ? { value: this.workspaceFolderInspectValue.value, override: this.workspaceFolderInspectValue.override } : undefined;
+        return this.toInspectValue(this.workspaceFolderInspectValue);
     }
     get memoryInspectValue() {
         if (this._memoryInspectValue === undefined) {
-            this._memoryInspectValue = this.inspect(this.memoryConfigurationModel, this.key, this.overrides.overrideIdentifier);
+            this._memoryInspectValue = this.memoryConfigurationModel.inspect(this.key, this.overrides.overrideIdentifier);
         }
         return this._memoryInspectValue;
     }
@@ -540,7 +553,7 @@ class ConfigurationInspectValue {
         return this.memoryInspectValue.merged;
     }
     get memory() {
-        return this.memoryInspectValue.value !== undefined || this.memoryInspectValue.override !== undefined ? { value: this.memoryInspectValue.value, override: this.memoryInspectValue.override } : undefined;
+        return this.toInspectValue(this.memoryInspectValue);
     }
 }
 let Configuration$1 = class Configuration {

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

@@ -1,4 +1,4 @@
-import { localize2WithPath, localizeWithPath } from '../../../nls.js';
+import { localize2WithPath } from '../../../nls.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 const EXTENSION_IDENTIFIER_REGEX = ( new RegExp(EXTENSION_IDENTIFIER_PATTERN));
@@ -150,15 +150,14 @@ const DISABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/disabled';
 const ENABLED_EXTENSIONS_STORAGE_PATH = 'extensionsIdentifiers/enabled';
 const IGlobalExtensionEnablementService = ( createDecorator('IGlobalExtensionEnablementService'));
 const IExtensionTipsService = ( createDecorator('IExtensionTipsService'));
-const ExtensionsLabel = ( localizeWithPath(
+const ExtensionsLocalizedLabel = ( localize2WithPath(
     'vs/platform/extensionManagement/common/extensionManagement',
     'extensions',
     "Extensions"
 ));
-const ExtensionsLocalizedLabel = { value: ExtensionsLabel, original: 'Extensions' };
 const PreferencesLocalizedLabel = ( localize2WithPath(
     'vs/platform/extensionManagement/common/extensionManagement',
     'preferences',
     'Preferences'
 ));
-export { DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionsLabel, ExtensionsLocalizedLabel, IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService, PreferencesLocalizedLabel, TargetPlatformToString, WEB_EXTENSION_TAG, getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };
+export { DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionGalleryError, ExtensionGalleryErrorCode, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionsLocalizedLabel, IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService, PreferencesLocalizedLabel, TargetPlatformToString, WEB_EXTENSION_TAG, getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };

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

@@ -190,7 +190,7 @@ interface IJSONValidation {
     /**
      * A schema URL ('http:', 'https:') or relative path to the extension folder ('./').
      */
-    readonly url?: string;
+    readonly url: string;
 }
 interface IKeyBinding {
     /**
@@ -395,7 +395,7 @@ interface IColor {
     /**
      * The description of the themable color
      */
-    readonly description?: string;
+    readonly description: string;
     readonly defaults: {
         /**
          * The default color for light themes. Either a color value in hex (#RRGGBB[AA]) or the identifier of a themable color which provides the default.

package/vscode/src/vs/platform/hover/browser/hover.js

@@ -1,3 +1,71 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { addStandardDisposableListener } from '../../../base/browser/dom.js';
 const IHoverService = ( createDecorator('hoverService'));
-export { IHoverService };
+let WorkbenchHoverDelegate = class WorkbenchHoverDelegate extends Disposable {
+    get delay() {
+        if (this.instantHover && Date.now() - this.lastHoverHideTime < this.timeLimit) {
+            return 0;
+        }
+        return this._delay;
+    }
+    constructor(placement, instantHover, overrideOptions = {}, configurationService, hoverService) {
+        super();
+        this.placement = placement;
+        this.instantHover = instantHover;
+        this.overrideOptions = overrideOptions;
+        this.configurationService = configurationService;
+        this.hoverService = hoverService;
+        this.lastHoverHideTime = Number.MAX_VALUE;
+        this.timeLimit = 200;
+        this.hoverDisposables = this._register(( new DisposableStore()));
+        this._delay = this.configurationService.getValue('workbench.hover.delay');
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('workbench.hover.delay')) {
+                this._delay = this.configurationService.getValue('workbench.hover.delay');
+            }
+        }));
+    }
+    showHover(options, focus) {
+        const overrideOptions = typeof this.overrideOptions === 'function' ? this.overrideOptions(options, focus) : this.overrideOptions;
+        this.hoverDisposables.clear();
+        const targets = options.target instanceof HTMLElement ? [options.target] : options.target.targetElements;
+        for (const target of targets) {
+            this.hoverDisposables.add(addStandardDisposableListener(target, 'keydown', (e) => {
+                if (e.equals(9 )) {
+                    this.hoverService.hideHover();
+                }
+            }));
+        }
+        return this.hoverService.showHover({
+            ...options,
+            persistence: {
+                hideOnHover: true
+            },
+            ...overrideOptions
+        }, focus);
+    }
+    setOptions(options) {
+        this.overrideOptions = options;
+    }
+    onDidHideHover() {
+        this.hoverDisposables.clear();
+        if (this.instantHover) {
+            this.lastHoverHideTime = Date.now();
+        }
+    }
+};
+WorkbenchHoverDelegate = ( __decorate([
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IHoverService))
+], WorkbenchHoverDelegate));
+const nativeHoverDelegate = {
+    showHover: function () {
+        throw new Error('Native hover function not implemented.');
+    },
+    delay: 0,
+    showNativeHover: true
+};
+export { IHoverService, WorkbenchHoverDelegate, nativeHoverDelegate };

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

@@ -31,7 +31,7 @@ else {
     product = { };
     if (( Object.keys(product)).length === 0) {
         Object.assign(product, {
-            version: '1.82.0-dev',
+            version: '1.87.0-dev',
             nameShort: 'Code - OSS Dev',
             nameLong: 'Code - OSS Dev',
             applicationName: 'code-oss',