@codingame/monaco-vscode-api 1.81.8-next.2 → 1.82.0-next.0

package/monaco-treemending.js

@@ -841,8 +841,8 @@ async function run() {
     const monacoPackageJsonFile = path.resolve(monacoDirectory, 'package.json');
     const monacoPackageJson = JSON.parse((await fs.readFile(monacoPackageJsonFile)).toString('utf-8'));
     const monacoVersion = monacoPackageJson.version;
-    if ("0.41.0" !== monacoVersion) {
-        console.error(`Wrong monaco-editor version: expecting ${"0.41.0"}, got ${monacoVersion}`);
+    if ("0.43.0" !== monacoVersion) {
+        console.error(`Wrong monaco-editor version: expecting ${"0.43.0"}, got ${monacoVersion}`);
         process.exit(1);
     }
     const alreadyPatched = monacoPackageJson.treemended ?? false;

package/monaco.d.ts

@@ -33,4 +33,4 @@ declare const Extensions: {
     JSONContribution: string;
 };
 
-export { DynamicKeybindingService, Extensions, IReference, ITextFileEditorModel, createConfiguredDiffEditor, createConfiguredEditor, createModelReference, deleteFile, writeFile };
+export { type DynamicKeybindingService, Extensions, IReference, ITextFileEditorModel, createConfiguredDiffEditor, createConfiguredEditor, createModelReference, deleteFile, writeFile };

package/monaco.js

@@ -148,6 +148,9 @@ let DelegateStandaloneKeybindingService = class DelegateStandaloneKeybindingServ
     _getResolver() {
         return this.delegate._getResolver();
     }
+    resolveKeyboardEvent(keyboardEvent) {
+        return this.delegate.resolveKeyboardEvent(keyboardEvent);
+    }
 };
 DelegateStandaloneKeybindingService = __decorate([
     ( __param(1, IContextKeyService)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.81.8-next.2",
+  "version": "1.82.0-next.0",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -10,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/CodinGame/monaco-vscode-api"
+    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -60,6 +60,6 @@
     "monaco-treemending": "./monaco-treemending.js"
   },
   "dependencies": {
-    "monaco-editor": "0.41.0"
+    "monaco-editor": "0.43.0"
   }
 }

package/service-override/extensions.d.ts

@@ -47,4 +47,4 @@ declare class SimpleExtensionService extends AbstractExtensionService implements
 declare function getServiceOverride(workerConfig?: WorkerConfig, _iframeAlternateDomains?: string): IEditorOverrideServices;
 declare function getLocalExtHostExtensionService(): Promise<LocalExtHostExtensionService>;
 
-export { ExtensionHostKind, IExtensionWithExtHostKind, LocalExtHostExtensionService, SimpleExtensionService, WorkerConfig, getServiceOverride as default, getLocalExtHostExtensionService };
+export { ExtensionHostKind, type IExtensionWithExtHostKind, LocalExtHostExtensionService, SimpleExtensionService, type WorkerConfig, getServiceOverride as default, getLocalExtHostExtensionService };

package/service-override/extensions.js

@@ -55,6 +55,9 @@ import '../vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurat
 import '../vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadLocalization.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadChatProvider.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadChatSlashCommands.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadClipboard.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadCommands.js';
@@ -118,7 +121,8 @@ import '../vscode/src/vs/workbench/api/browser/mainThreadTesting.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadSecretState.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadShare.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadProfilContentHandlers.js';
-import '../vscode/src/vs/workbench/api/browser/mainThreadSemanticSimilarity.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
+import '../vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
 import '../vscode/src/vs/workbench/api/browser/mainThreadIssueReporter.js';
 import '../vscode/src/vs/workbench/api/common/extHost.common.services.js';
 import { IDialogService } from '../vscode/src/vs/platform/dialogs/common/dialogs.js';

package/service-override/keybindings.d.ts

@@ -2,6 +2,9 @@ export { IUserFriendlyKeybinding } from '../vscode/src/vs/platform/keybinding/co
 import { IEditorOverrideServices } from '../vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 
 declare function updateUserKeybindings(keybindingsJson: string): Promise<void>;
-declare function getServiceOverride(): IEditorOverrideServices;
+interface KeybindingsProps {
+    shouldUseGlobalKeybindings?: () => boolean;
+}
+declare function getServiceOverride({ shouldUseGlobalKeybindings }?: KeybindingsProps): IEditorOverrideServices;
 
 export { getServiceOverride as default, updateUserKeybindings };

package/service-override/keybindings.js

@@ -1,3 +1,4 @@
+import { __decorate, __param } from '../external/tslib/tslib.es6.js';
 import '../missing-services.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
@@ -11,6 +12,14 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { CommandService } from '../vscode/src/vs/workbench/services/commands/common/commandService.js';
 import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { IUserDataProfileService } from '../vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js';
+import { IHostService } from '../vscode/src/vs/workbench/services/host/browser/host.js';
+import { IExtensionService } from '../vscode/src/vs/workbench/services/extensions/common/extensions.js';
+import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import getServiceOverride$1 from './files.js';
 import '../vscode/src/vs/workbench/browser/workbench.contribution.js';
 import '../vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
@@ -18,9 +27,10 @@ async function updateUserKeybindings(keybindingsJson) {
     const userDataProfilesService = StandaloneServices.get(IUserDataProfilesService);
     await StandaloneServices.get(IFileService).writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
 }
-class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
-    constructor() {
-        super(...arguments);
+let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
+    constructor(shouldUseGlobalKeybindings, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
+        super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService);
+        this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
         this.keybindingProviders = [];
     }
     registerKeybindingProvider(provider) {
@@ -37,14 +47,33 @@ class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
     _getResolver() {
         return super._getResolver();
     }
+    _dispatch(e, target) {
+        if (!this.shouldUseGlobalKeybindings()) {
+            return false;
+        }
+        return super._dispatch(e, target);
+    }
     getUserKeybindingItems() {
         return [...super.getUserKeybindingItems(), ...this.keybindingProviders.flatMap(provider => provider())];
     }
-}
-function getServiceOverride() {
+};
+DynamicWorkbenchKeybindingService = __decorate([
+    ( __param(1, IContextKeyService)),
+    ( __param(2, ICommandService)),
+    ( __param(3, ITelemetryService)),
+    ( __param(4, INotificationService)),
+    ( __param(5, IUserDataProfileService)),
+    ( __param(6, IHostService)),
+    ( __param(7, IExtensionService)),
+    ( __param(8, IFileService)),
+    ( __param(9, IUriIdentityService)),
+    ( __param(10, ILogService)),
+    ( __param(11, IKeyboardLayoutService))
+], DynamicWorkbenchKeybindingService);
+function getServiceOverride({ shouldUseGlobalKeybindings = () => false } = {}) {
     return {
         ...getServiceOverride$1(),
-        [( IKeybindingService.toString())]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [], false),
+        [( IKeybindingService.toString())]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings], false),
         [( IKeyboardLayoutService.toString())]: new SyncDescriptor(BrowserKeyboardLayoutService, undefined, true),
         [( ICommandService.toString())]: new SyncDescriptor(CommandService, [], true)
     };

package/service-override/quickaccess.d.ts

@@ -1,8 +1,9 @@
 import { IEditorOverrideServices } from '../vscode/src/vs/editor/standalone/browser/standaloneServices.js';
+import { ICodeEditor } from '../vscode/src/vs/editor/browser/editorBrowser.js';
 
 interface QuickAccessProps {
     isKeybindingConfigurationVisible?: () => boolean;
-    shouldUseGlobalPicker?: () => boolean;
+    shouldUseGlobalPicker?: (activeCodeEditor: ICodeEditor | null, activeCodeEditorStandalone: boolean) => boolean;
 }
 declare function getServiceOverride({ isKeybindingConfigurationVisible: _isKeybindingConfigurationVisible, shouldUseGlobalPicker: _shouldUseGlobalPicker }?: QuickAccessProps): IEditorOverrideServices;
 

package/service-override/quickaccess.js

@@ -17,7 +17,7 @@ import '../vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contr
 let isKeybindingConfigurationVisible = () => {
     return false;
 };
-let shouldUseGlobalPicker = () => {
+let shouldUseGlobalPicker = (_activeCodeEditor, _activeCodeEditorStandalone) => {
     return false;
 };
 const original = CommandsQuickAccessProvider.prototype['getCommandPicks'];
@@ -38,7 +38,7 @@ let DelegateQuickInputService = class DelegateQuickInputService {
     }
     get activeService() {
         const activeCodeEditor = StandaloneServices.get(ICodeEditorService).getFocusedCodeEditor();
-        if (!(activeCodeEditor instanceof StandaloneCodeEditor) && shouldUseGlobalPicker()) {
+        if (shouldUseGlobalPicker(activeCodeEditor, activeCodeEditor instanceof StandaloneCodeEditor)) {
             return this.workbenchQuickInputService;
         }
         this.standaloneQuickInputService ?? (this.standaloneQuickInputService = this.instantiationService.createInstance(StandaloneQuickInputService));
@@ -48,6 +48,9 @@ let DelegateQuickInputService = class DelegateQuickInputService {
     get backButton() { return this.activeService.backButton; }
     get onShow() { return this.activeService.onShow; }
     get onHide() { return this.activeService.onHide; }
+    createQuickWidget() {
+        return this.activeService.createQuickWidget();
+    }
     pick(picks, options = {}, token = CancellationToken.None) {
         return this.activeService .pick(picks, options, token);
     }

package/service-override/search.js

@@ -2,7 +2,7 @@ import '../missing-services.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
 import { ISearchService } from '../vscode/src/vs/workbench/services/search/common/search.js';
 import { SearchService } from '../vscode/src/vs/workbench/services/search/common/searchService.js';
-import { ISearchWorkbenchService, SearchWorkbenchService } from '../vscode/src/vs/workbench/contrib/search/browser/searchModel.js';
+import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from '../vscode/src/vs/workbench/contrib/search/browser/searchModel.js';
 import { ISearchHistoryService, SearchHistoryService } from '../vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js';
 import { IReplaceService } from '../vscode/src/vs/workbench/contrib/search/browser/replace.js';
 import { ReplaceService } from '../vscode/src/vs/workbench/contrib/search/browser/replaceService.js';
@@ -11,7 +11,7 @@ import '../vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.con
 function getServiceOverride() {
     return {
         [( ISearchService.toString())]: new SyncDescriptor(SearchService, [], true),
-        [( ISearchWorkbenchService.toString())]: new SyncDescriptor(SearchWorkbenchService, [], true),
+        [( ISearchViewModelWorkbenchService.toString())]: new SyncDescriptor(SearchViewModelWorkbenchService, [], true),
         [( ISearchHistoryService.toString())]: new SyncDescriptor(SearchHistoryService, [], true),
         [( IReplaceService.toString())]: new SyncDescriptor(ReplaceService, [], true)
     };

package/service-override/snippets.d.ts

@@ -6,4 +6,4 @@ interface ISnippetsExtensionPoint {
 }
 declare function getServiceOverride(): IEditorOverrideServices;
 
-export { ISnippetsExtensionPoint, getServiceOverride as default };
+export { type ISnippetsExtensionPoint, getServiceOverride as default };

package/service-override/storage.d.ts

@@ -37,4 +37,4 @@ declare class InjectedBrowserStorageService extends BrowserStorageService {
 }
 declare function getStorageServiceOverride(provider?: IStorageProvider): IEditorOverrideServices;
 
-export { InjectedBrowserStorageService as BrowserStorageService, ExternalStorageService, IStorageItemsChangeEvent, IStorageProvider, StorageScope, getStorageServiceOverride as default };
+export { InjectedBrowserStorageService as BrowserStorageService, ExternalStorageService, IStorageItemsChangeEvent, type IStorageProvider, StorageScope, getStorageServiceOverride as default };

package/service-override/theme.d.ts

@@ -4,4 +4,4 @@ import { IEditorOverrideServices } from '../vscode/src/vs/editor/standalone/brow
 type PartialIThemeExtensionPoint = Partial<IThemeExtensionPoint> & Pick<IThemeExtensionPoint, 'id' | 'path'>;
 declare function getServiceOverride(): IEditorOverrideServices;
 
-export { PartialIThemeExtensionPoint as IThemeExtensionPoint, getServiceOverride as default };
+export { type PartialIThemeExtensionPoint as IThemeExtensionPoint, getServiceOverride as default };

package/service-override/tools/editor.d.ts

@@ -30,4 +30,4 @@ declare class MonacoEditorService extends EditorService {
     openEditor(editor: EditorInput | IUntypedEditorInput, optionsOrPreferredGroup?: IEditorOptions | PreferredGroup, preferredGroup?: PreferredGroup): Promise<IEditorPane | undefined>;
 }
 
-export { MonacoEditorService, OpenEditor };
+export { MonacoEditorService, type OpenEditor };

package/service-override/tools/editor.js

@@ -23,6 +23,7 @@ import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { TextResourceEditorInput } from '../../vscode/src/vs/workbench/common/editor/textResourceEditorInput.js';
 import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { unsupported } from '../../tools.js';
+var StandaloneEditorGroup_1;
 class SimpleEditorPane {
     constructor(editor) {
         this.editor = editor;
@@ -156,7 +157,7 @@ class StandaloneEditorPane {
         this.editor.focus();
     }
 }
-let StandaloneEditorGroup = class StandaloneEditorGroup extends Disposable {
+let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGroup extends Disposable {
     constructor(editor, instantiationService, scopedContextKeyService) {
         super();
         this.editor = editor;
@@ -186,7 +187,7 @@ let StandaloneEditorGroup = class StandaloneEditorGroup extends Disposable {
         this.onWillMoveEditor = Event.None;
         this._onWillOpenEditor = new Emitter();
         this.onWillOpenEditor = this._onWillOpenEditor.event;
-        this.id = --StandaloneEditorGroup.idCounter;
+        this.id = --StandaloneEditorGroup_1.idCounter;
         this.index = -1;
         this.label = `standalone editor ${this.editor.getId()}`;
         this.ariaLabel = `standalone editor ${this.editor.getId()}`;
@@ -302,7 +303,7 @@ let StandaloneEditorGroup = class StandaloneEditorGroup extends Disposable {
     }
 };
 StandaloneEditorGroup.idCounter = 0;
-StandaloneEditorGroup = __decorate([
+StandaloneEditorGroup = StandaloneEditorGroup_1 = __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IContextKeyService))
 ], StandaloneEditorGroup);

package/service-override/views.d.ts

@@ -72,4 +72,4 @@ declare function registerCustomView(options: CustomViewOption): IDisposable;
 declare function isEditorPartVisible(): boolean;
 declare function getServiceOverride(openEditorFallback?: OpenEditor, _webviewIframeAlternateDomains?: string): IEditorOverrideServices;
 
-export { CustomViewOption, EditorPanelOption, IEditorCloseHandler, OpenEditor, Parts, ViewContainerLocation, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { type CustomViewOption, type EditorPanelOption, IEditorCloseHandler, OpenEditor, Parts, ViewContainerLocation, attachPart, getServiceOverride as default, isEditorPartVisible, isPartVisibile, onPartVisibilityChange, registerCustomView, registerEditorPane, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/service-override/views.js

@@ -60,7 +60,6 @@ import { CodeEditorService } from '../vscode/src/vs/workbench/services/editor/br
 import { IUntitledTextEditorService, UntitledTextEditorService } from '../vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js';
 import { StatusbarPart } from '../vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
 import { IStatusbarService } from '../vscode/src/vs/workbench/services/statusbar/browser/statusbar.js';
-import { ISemanticSimilarityService, SemanticSimilarityService } from '../vscode/src/vs/workbench/services/semanticSimilarity/common/semanticSimilarityService.js';
 import { IHistoryService } from '../vscode/src/vs/workbench/services/history/common/history.js';
 import { HistoryService } from '../vscode/src/vs/workbench/services/history/browser/historyService.js';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
@@ -89,6 +88,7 @@ import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/
 import getServiceOverride$2 from './bulkEdit.js';
 import getServiceOverride$1 from './layout.js';
 import getServiceOverride$3 from './quickaccess.js';
+import getServiceOverride$4 from './keybindings.js';
 import { changeUrlDomain } from './tools/url.js';
 import { registerAssets } from '../assets.js';
 import { registerServiceInitializePostParticipant } from '../lifecycle.js';
@@ -473,6 +473,9 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains)
             isKeybindingConfigurationVisible: isEditorPartVisible,
             shouldUseGlobalPicker: isEditorPartVisible
         }),
+        ...getServiceOverride$4({
+            shouldUseGlobalKeybindings: isEditorPartVisible
+        }),
         [( IViewsService.toString())]: new SyncDescriptor(ViewsService, [], false),
         [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
@@ -489,7 +492,6 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains)
         [( IBreadcrumbsService.toString())]: new SyncDescriptor(BreadcrumbsService, [], true),
         [( IContextViewService.toString())]: new SyncDescriptor(ContextViewService, [], true),
         [( IUntitledTextEditorService.toString())]: new SyncDescriptor(UntitledTextEditorService, [], true),
-        [( ISemanticSimilarityService.toString())]: new SyncDescriptor(SemanticSimilarityService, [], true),
         [( IHistoryService.toString())]: new SyncDescriptor(HistoryService, [], false),
         [( IOutlineService.toString())]: new SyncDescriptor(OutlineService, [], true),
         [( ICustomEditorService.toString())]: new SyncDescriptor(CustomEditorService, [], true),

package/vscode/src/vs/base/browser/contextmenu.d.ts

@@ -46,4 +46,4 @@ interface IContextMenuProvider {
     showContextMenu(delegate: IContextMenuDelegate): void;
 }
 
-export { IContextMenuDelegate, IContextMenuEvent, IContextMenuProvider };
+export type { IContextMenuDelegate, IContextMenuEvent, IContextMenuProvider };

package/vscode/src/vs/base/browser/dom.d.ts

@@ -17,4 +17,4 @@ interface IDomPosition {
     readonly top: number;
 }
 
-export { Dimension, IDimension, IDomPosition };
+export { Dimension, type IDimension, type IDomPosition };

package/vscode/src/vs/base/browser/keyboardEvent.d.ts

@@ -21,4 +21,4 @@ interface IKeyboardEvent {
     stopPropagation(): void;
 }
 
-export { IKeyboardEvent };
+export type { IKeyboardEvent };

package/vscode/src/vs/base/browser/mouseEvent.d.ts

@@ -36,4 +36,4 @@ declare class StandardMouseEvent implements IMouseEvent {
     stopPropagation(): void;
 }
 
-export { IMouseEvent, StandardMouseEvent };
+export { type IMouseEvent, StandardMouseEvent };

package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.d.ts

@@ -14,4 +14,4 @@ interface IActionViewItemOptions extends IBaseActionViewItemOptions {
     toggleStyles?: IToggleStyles;
 }
 
-export { IActionViewItemOptions, IBaseActionViewItemOptions };
+export type { IActionViewItemOptions, IBaseActionViewItemOptions };

package/vscode/src/vs/base/browser/ui/actionbar/actionbar.d.ts

@@ -38,6 +38,12 @@ interface IActionBarOptions {
     readonly preventLoopNavigation?: boolean;
     readonly focusOnlyEnabledItems?: boolean;
     readonly hoverDelegate?: IHoverDelegate;
+    /**
+     * If true, toggled primary items are highlighted with a background color.
+     * Some action bars exclusively use icon states, we don't want to enable this for them.
+     * Thus, this is opt-in.
+     */
+    readonly highlightToggledItems?: boolean;
 }
 interface IActionOptions extends IActionViewItemOptions {
     index?: number;
@@ -99,4 +105,4 @@ declare class ActionBar extends Disposable implements IActionRunner {
     dispose(): void;
 }
 
-export { ActionBar, ActionTrigger, ActionsOrientation, IActionBarOptions, IActionOptions, IActionViewItem, IActionViewItemProvider };
+export { ActionBar, type ActionTrigger, ActionsOrientation, type IActionBarOptions, type IActionOptions, type IActionViewItem, type IActionViewItemProvider };

package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.d.ts

@@ -67,4 +67,4 @@ declare class BreadcrumbsWidget {
     private _onClick;
 }
 
-export { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent, IBreadcrumbsWidgetStyles };
+export { BreadcrumbsItem, BreadcrumbsWidget, type IBreadcrumbsItemEvent, type IBreadcrumbsWidgetStyles };

package/vscode/src/vs/base/browser/ui/contextview/contextview.d.ts

@@ -43,4 +43,4 @@ interface IContextViewProvider {
     layout(): void;
 }
 
-export { AnchorAlignment, AnchorAxisAlignment, AnchorPosition, IAnchor, IContextViewProvider, IDelegate };
+export { AnchorAlignment, AnchorAxisAlignment, AnchorPosition, type IAnchor, type IContextViewProvider, type IDelegate };

package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.d.ts

@@ -20,4 +20,4 @@ interface IDropdownMenuActionViewItemOptions extends IBaseActionViewItemOptions
     readonly skipTelemetry?: boolean;
 }
 
-export { IAnchorAlignmentProvider, IDropdownMenuActionViewItemOptions, IKeybindingProvider };
+export type { IAnchorAlignmentProvider, IDropdownMenuActionViewItemOptions, IKeybindingProvider };

package/vscode/src/vs/base/browser/ui/grid/grid.d.ts

@@ -26,4 +26,4 @@ interface ISerializableView extends IView {
     toJSON(): object;
 }
 
-export { Direction, ISerializableView, IView };
+export { Direction, type ISerializableView, type IView };

package/vscode/src/vs/base/browser/ui/grid/gridview.d.ts

@@ -95,4 +95,4 @@ interface IView {
     setBoundarySashes?(sashes: IBoundarySashes): void;
 }
 
-export { IView, IViewSize, LayoutPriority };
+export { type IView, type IViewSize, LayoutPriority };

package/vscode/src/vs/base/browser/ui/grid/gridview.js

@@ -390,6 +390,7 @@ class BranchNode {
         this.splitviewSashResetDisposable.dispose();
         this.childrenSashResetDisposable.dispose();
         this.childrenChangeDisposable.dispose();
+        this.onDidScrollDisposable.dispose();
         this.splitview.dispose();
     }
 }

package/vscode/src/vs/base/browser/ui/iconLabel/iconHoverDelegate.d.ts

@@ -53,4 +53,4 @@ interface IHoverWidget extends IDisposable {
     readonly isDisposed: boolean;
 }
 
-export { IHoverDelegate, IHoverDelegateOptions, IHoverDelegateTarget, IHoverWidget };
+export type { IHoverDelegate, IHoverDelegateOptions, IHoverDelegateTarget, IHoverWidget };

package/vscode/src/vs/base/browser/ui/iconLabel/iconLabelHover.d.ts

@@ -13,4 +13,4 @@ interface IUpdatableHoverOptions {
     linkHandler?(url: string): void;
 }
 
-export { IUpdatableHoverOptions };
+export type { IUpdatableHoverOptions };

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -14,7 +14,6 @@ import { ScanCodeUtils } from 'monaco-editor/esm/vs/base/common/keyCodes.js';
 import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import './menubar.css.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 const $ = dom.$;
@@ -807,7 +806,7 @@ class MenuBar extends Disposable {
             getKeyBinding: this.options.getKeybinding,
             actionRunner: this.actionRunner,
             enableMnemonics: this.options.alwaysOnMnemonics || (this.mnemonicsInUse && this.options.enableMnemonics),
-            ariaLabel: withNullAsUndefined(customMenu.buttonElement.getAttribute('aria-label')),
+            ariaLabel: customMenu.buttonElement.getAttribute('aria-label') ?? undefined,
             expandDirection: this.isCompact ? this.options.compactMode : Direction.Right,
             useEventAsContext: true
         };

package/vscode/src/vs/base/browser/ui/sash/sash.d.ts

@@ -222,4 +222,4 @@ declare class Sash extends Disposable {
     dispose(): void;
 }
 
-export { IBoundarySashes, IHorizontalSashLayoutProvider, IHorizontalSashOptions, ISashEvent, ISashOptions, IVerticalSashLayoutProvider, IVerticalSashOptions, Orientation, OrthogonalEdge, Sash, SashState };
+export { type IBoundarySashes, type IHorizontalSashLayoutProvider, type IHorizontalSashOptions, type ISashEvent, type ISashOptions, type IVerticalSashLayoutProvider, type IVerticalSashOptions, Orientation, OrthogonalEdge, Sash, SashState };

package/vscode/src/vs/base/browser/ui/splitview/paneview.d.ts

@@ -83,4 +83,4 @@ interface IPaneViewOptions {
     orientation?: Orientation;
 }
 
-export { IPaneDndController, IPaneOptions, IPaneStyles, IPaneViewOptions, Pane };
+export { type IPaneDndController, type IPaneOptions, type IPaneStyles, type IPaneViewOptions, Pane };

package/vscode/src/vs/base/browser/ui/splitview/splitview.d.ts

@@ -81,4 +81,4 @@ interface IView<TLayoutContext = undefined> {
     setVisible?(visible: boolean): void;
 }
 
-export { IView, LayoutPriority };
+export { type IView, LayoutPriority };

package/vscode/src/vs/base/browser/ui/toggle/toggle.d.ts

@@ -4,4 +4,4 @@ interface IToggleStyles {
     readonly inputActiveOptionBackground: string | undefined;
 }
 
-export { IToggleStyles };
+export type { IToggleStyles };

package/vscode/src/vs/base/browser/ui/toolbar/toolbar.d.ts

@@ -19,6 +19,10 @@ interface IToolBarOptions {
     moreIcon?: ThemeIcon;
     allowContextMenu?: boolean;
     skipTelemetry?: boolean;
+    /**
+     * If true, toggled primary items are highlighted with a background color.
+     */
+    highlightToggledItems?: boolean;
 }
 /**
  * A widget that combines an action bar for primary actions and a dropdown for secondary actions.
@@ -53,4 +57,4 @@ declare class ToolBar extends Disposable {
     dispose(): void;
 }
 
-export { IToolBarOptions, ToolBar };
+export { type IToolBarOptions, ToolBar };

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

@@ -32,4 +32,4 @@ declare class SubmenuAction implements IAction {
     run(): Promise<void>;
 }
 
-export { IAction, IActionRunner, IRunEvent, SubmenuAction };
+export { type IAction, type IActionRunner, type IRunEvent, SubmenuAction };

package/vscode/src/vs/base/common/async.d.ts

@@ -2,4 +2,4 @@ interface CancelablePromise<T> extends Promise<T> {
     cancel(): void;
 }
 
-export { CancelablePromise };
+export type { CancelablePromise };

package/vscode/src/vs/base/common/buffer.d.ts

@@ -57,4 +57,4 @@ interface VSBufferReadable extends Readable<VSBuffer> {
 interface VSBufferReadableStream extends ReadableStream<VSBuffer> {
 }
 
-export { VSBuffer, VSBufferReadable, VSBufferReadableStream };
+export { VSBuffer, type VSBufferReadable, type VSBufferReadableStream };

package/vscode/src/vs/base/common/codicons.d.ts

@@ -25,6 +25,7 @@ declare const Codicon: {
     readonly tag: ThemeIcon;
     readonly tagAdd: ThemeIcon;
     readonly tagRemove: ThemeIcon;
+    readonly gitPullRequestLabel: ThemeIcon;
     readonly person: ThemeIcon;
     readonly personFollow: ThemeIcon;
     readonly personOutline: ThemeIcon;
@@ -279,6 +280,7 @@ declare const Codicon: {
     readonly megaphone: ThemeIcon;
     readonly mention: ThemeIcon;
     readonly milestone: ThemeIcon;
+    readonly gitPullRequestMilestone: ThemeIcon;
     readonly mortarBoard: ThemeIcon;
     readonly move: ThemeIcon;
     readonly multipleWindows: ThemeIcon;
@@ -403,9 +405,11 @@ declare const Codicon: {
     readonly menu: ThemeIcon;
     readonly expandAll: ThemeIcon;
     readonly feedback: ThemeIcon;
+    readonly gitPullRequestReviewer: ThemeIcon;
     readonly groupByRefType: ThemeIcon;
     readonly ungroupByRefType: ThemeIcon;
     readonly account: ThemeIcon;
+    readonly gitPullRequestAssignee: ThemeIcon;
     readonly bellDot: ThemeIcon;
     readonly debugConsole: ThemeIcon;
     readonly library: ThemeIcon;
@@ -528,6 +532,7 @@ declare const Codicon: {
     readonly send: ThemeIcon;
     readonly sparkle: ThemeIcon;
     readonly insert: ThemeIcon;
+    readonly mic: ThemeIcon;
     readonly dialogError: ThemeIcon;
     readonly dialogWarning: ThemeIcon;
     readonly dialogInfo: ThemeIcon;

package/vscode/src/vs/base/common/collections.d.ts

@@ -4,4 +4,4 @@
  */
 type IStringDictionary<V> = Record<string, V>;
 
-export { IStringDictionary };
+export type { IStringDictionary };

package/vscode/src/vs/base/common/dataTransfer.d.ts

@@ -38,4 +38,4 @@ interface IReadonlyVSDataTransfer extends Iterable<readonly [string, IDataTransf
     get(mimeType: string): IDataTransferItem | undefined;
 }
 
-export { IDataTransferFile, IDataTransferItem, IReadonlyVSDataTransfer };
+export type { IDataTransferFile, IDataTransferItem, IReadonlyVSDataTransfer };

package/vscode/src/vs/base/common/errors.d.ts

@@ -25,4 +25,4 @@ interface SerializedError {
     readonly noTelemetry: boolean;
 }
 
-export { ErrorHandler, ErrorListenerCallback, ErrorListenerUnbind, SerializedError, errorHandler };
+export { ErrorHandler, type ErrorListenerCallback, type ErrorListenerUnbind, type SerializedError, errorHandler };