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

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -21,7 +21,9 @@ import { findGroup } from '../common/editorGroupFinder.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { PauseableEmitter } from 'monaco-editor/esm/vs/base/common/event.js';
+var EditorResolverService_1;
 let EditorResolverService = class EditorResolverService extends Disposable {
+    static { EditorResolverService_1 = this; }
     static { this.configureDefaultID = 'promptOpenWith.configureDefault'; }
     static { this.cacheStorageID = 'editorOverrideService.cache'; }
     static { this.conflictingDefaultsStorageID = 'editorOverrideService.conflictingDefaults'; }
@@ -42,9 +44,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         this._flattenedEditors = ( new Map());
         this._shouldReFlattenEditors = true;
         this.cache = ( new Set(
-            JSON.parse(this.storageService.get(EditorResolverService.cacheStorageID, 0 , JSON.stringify([])))
+            JSON.parse(this.storageService.get(EditorResolverService_1.cacheStorageID, 0 , JSON.stringify([])))
         ));
-        this.storageService.remove(EditorResolverService.cacheStorageID, 0 );
+        this.storageService.remove(EditorResolverService_1.cacheStorageID, 0 );
         this._register(this.storageService.onWillSaveState(() => {
             this.cacheEditors();
         }));
@@ -185,7 +187,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     getAssociationsForResource(resource) {
         const associations = this.getAllUserAssociations();
-        const matchingAssociations = associations.filter(association => association.filenamePattern && globMatchesResource(association.filenamePattern, resource));
+        let matchingAssociations = associations.filter(association => association.filenamePattern && globMatchesResource(association.filenamePattern, resource));
+        matchingAssociations = matchingAssociations.sort((a, b) => (b.filenamePattern?.length ?? 0) - (a.filenamePattern?.length ?? 0));
         const allEditors = this._registeredEditors;
         return matchingAssociations.filter(association => allEditors.find(c => c.editorInfo.id === association.viewType));
     }
@@ -405,12 +408,12 @@ let EditorResolverService = class EditorResolverService extends Disposable {
     }
     async doHandleConflictingDefaults(resource, editorName, untypedInput, currentEditor, group) {
         const editors = this.findMatchingEditors(resource);
-        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService.conflictingDefaultsStorageID, 0 , '{}'));
+        const storedChoices = JSON.parse(this.storageService.get(EditorResolverService_1.conflictingDefaultsStorageID, 0 , '{}'));
         const globForResource = `*${extname(resource)}`;
         const writeCurrentEditorsToStorage = () => {
             storedChoices[globForResource] = [];
             editors.forEach(editor => storedChoices[globForResource].push(editor.editorInfo.id));
-            this.storageService.store(EditorResolverService.conflictingDefaultsStorageID, JSON.stringify(storedChoices), 0 , 1 );
+            this.storageService.store(EditorResolverService_1.conflictingDefaultsStorageID, JSON.stringify(storedChoices), 0 , 1 );
         };
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
@@ -492,7 +495,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             const separator = { type: 'separator' };
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
-                id: EditorResolverService.configureDefaultID,
+                id: EditorResolverService_1.configureDefaultID,
                 label: ( localize(
                     'promptOpenWith.configureDefault',
                     "Configure default editor for '{0}'...",
@@ -554,7 +557,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         }));
         editorPicker.dispose();
         if (picked) {
-            if (picked.item.id === EditorResolverService.configureDefaultID) {
+            if (picked.item.id === EditorResolverService_1.configureDefaultID) {
                 return this.doPickEditor(editor, true);
             }
             const targetOptions = {
@@ -591,7 +594,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 cacheStorage.add(association.filenamePattern);
             }
         }
-        this.storageService.store(EditorResolverService.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), 0 , 1 );
+        this.storageService.store(EditorResolverService_1.cacheStorageID, JSON.stringify(Array.from(cacheStorage)), 0 , 1 );
     }
     resourceMatchesCache(resource) {
         if (!this.cache) {
@@ -605,7 +608,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         return false;
     }
 };
-EditorResolverService = ( __decorate([
+EditorResolverService = EditorResolverService_1 = ( __decorate([
     ( __param(0, IEditorGroupsService)),
     ( __param(1, IInstantiationService)),
     ( __param(2, IConfigurationService)),

package/vscode/src/vs/workbench/services/editor/browser/editorService.js

@@ -15,7 +15,7 @@ import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configurati
 import { Disposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { distinct, coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { isCodeEditor, isDiffEditor, isCompositeEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
-import { withNullAsUndefined, isUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { isUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
 import { EditorsObserver } from '../../../browser/parts/editor/editorsObserver.js';
 import { timeout, Promises } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
@@ -60,9 +60,9 @@ let EditorService = class EditorService extends Disposable {
     }
     registerListeners() {
         this.editorGroupService.whenReady.then(() => this.onEditorGroupsReady());
-        this.editorGroupService.onDidChangeActiveGroup(group => this.handleActiveEditorChange(group));
-        this.editorGroupService.onDidAddGroup(group => this.registerGroupListeners(group));
-        this.editorsObserver.onDidMostRecentlyActiveEditorsChange(() => this._onDidMostRecentlyActiveEditorsChange.fire());
+        this._register(this.editorGroupService.onDidChangeActiveGroup(group => this.handleActiveEditorChange(group)));
+        this._register(this.editorGroupService.onDidAddGroup(group => this.registerGroupListeners(group)));
+        this._register(this.editorsObserver.onDidMostRecentlyActiveEditorsChange(() => this._onDidMostRecentlyActiveEditorsChange.fire()));
         this._register(this.onDidVisibleEditorsChange(() => this.handleVisibleEditorsChange()));
         this._register(this.fileService.onDidRunOperation(e => this.onDidRunFileOperation(e)));
         this._register(this.fileService.onDidFilesChange(e => this.onDidFilesChange(e)));
@@ -88,7 +88,7 @@ let EditorService = class EditorService extends Disposable {
     }
     doHandleActiveEditorChangeEvent() {
         const activeGroup = this.editorGroupService.activeGroup;
-        this.lastActiveEditor = withNullAsUndefined(activeGroup.activeEditor);
+        this.lastActiveEditor = activeGroup.activeEditor ?? undefined;
         this._onDidActiveEditorChange.fire();
     }
     registerGroupListeners(group) {
@@ -322,7 +322,7 @@ let EditorService = class EditorService extends Disposable {
     }
     get activeEditor() {
         const activeGroup = this.editorGroupService.activeGroup;
-        return activeGroup ? withNullAsUndefined(activeGroup.activeEditor) : undefined;
+        return activeGroup ? activeGroup.activeEditor ?? undefined : undefined;
     }
     get visibleEditorPanes() {
         return coalesce(( this.editorGroupService.groups.map(group => group.activeEditorPane)));

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

@@ -5,4 +5,4 @@
  */
 type EditorGroupColumn = number;
 
-export { EditorGroupColumn };
+export type { EditorGroupColumn };

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

@@ -609,4 +609,4 @@ interface IEditorGroup {
     focus(): void;
 }
 
-export { EditorGroupLayout, GroupDirection, GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, IAddGroupOptions, ICloseAllEditorsOptions, ICloseEditorOptions, ICloseEditorsFilter, IEditorGroup, IEditorGroupsService, IEditorReplacement, IEditorSideGroup, IFindGroupScope, IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IAddGroupOptions, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorGroup, IEditorGroupsService, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };

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

@@ -111,4 +111,4 @@ interface IEditorResolverService {
     getEditors(): RegisteredEditorInfo[];
 }
 
-export { DiffEditorInputFactoryFunction, EditorAssociation, EditorAssociations, EditorInputFactoryFunction, EditorInputFactoryObject, IEditorResolverService, MergeEditorInputFactoryFunction, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority, ResolvedEditor, ResolvedStatus, UntitledEditorInputFactoryFunction };
+export { type DiffEditorInputFactoryFunction, type EditorAssociation, type EditorAssociations, type EditorInputFactoryFunction, type EditorInputFactoryObject, IEditorResolverService, type MergeEditorInputFactoryFunction, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority, type ResolvedEditor, ResolvedStatus, type UntitledEditorInputFactoryFunction };

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

@@ -277,4 +277,4 @@ interface IEditorService {
     revertAll(options?: IRevertAllEditorsOptions): Promise<boolean>;
 }
 
-export { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IBaseSaveRevertAllEditorOptions, IEditorService, IEditorsChangeEvent, IOpenEditorsOptions, IRevertAllEditorsOptions, ISaveAllEditorsOptions, ISaveEditorsOptions, ISaveEditorsResult, IUntypedEditorReplacement, PreferredGroup, SIDE_GROUP, SIDE_GROUP_TYPE };
+export { ACTIVE_GROUP, type ACTIVE_GROUP_TYPE, type IBaseSaveRevertAllEditorOptions, IEditorService, type IEditorsChangeEvent, type IOpenEditorsOptions, type IRevertAllEditorsOptions, type ISaveAllEditorsOptions, type ISaveEditorsOptions, type ISaveEditorsResult, type IUntypedEditorReplacement, type PreferredGroup, SIDE_GROUP, type SIDE_GROUP_TYPE };

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

@@ -115,4 +115,4 @@ interface IWorkbenchExtensionEnablementService {
     updateExtensionsEnablementsWhenWorkspaceTrustChanges(): Promise<void>;
 }
 
-export { DidChangeProfileEvent, DidChangeProfileForServerEvent, DidUninstallExtensionOnServerEvent, EnablementState, IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, InstallExtensionOnServerEvent, UninstallExtensionOnServerEvent };
+export { type DidChangeProfileEvent, type DidChangeProfileForServerEvent, type DidUninstallExtensionOnServerEvent, EnablementState, type IExtensionManagementServer, IProfileAwareExtensionManagementService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService, type InstallExtensionOnServerEvent, type UninstallExtensionOnServerEvent };

package/vscode/src/vs/workbench/services/extensions/browser/extensionService.js

@@ -10,6 +10,7 @@ import { extensionRunningPreferenceToString, extensionHostKindToString } from '.
 import { filterExtensionDescriptions } from '../common/extensionRunningLocationTracker.js';
 import { RemoteExtensionHost } from '../common/remoteExtensionHost.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
+var BrowserExtensionHostKindPicker_1;
 let BrowserExtensionHostFactory = class BrowserExtensionHostFactory {
     constructor(_extensionsProposedApi, _scanWebExtensions, _getExtensions, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService) {
         this._extensionsProposedApi = _extensionsProposedApi;
@@ -92,12 +93,12 @@ BrowserExtensionHostFactory = ( __decorate([
     ( __param(5, IRemoteAuthorityResolverService)),
     ( __param(6, IWorkbenchExtensionEnablementService))
 ], BrowserExtensionHostFactory));
-let BrowserExtensionHostKindPicker = class BrowserExtensionHostKindPicker {
+let BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = class BrowserExtensionHostKindPicker {
     constructor(_logService) {
         this._logService = _logService;
     }
     pickExtensionHostKind(extensionId, extensionKinds, isInstalledLocally, isInstalledRemotely, preference) {
-        const result = BrowserExtensionHostKindPicker.pickRunningLocation(extensionKinds, isInstalledLocally, isInstalledRemotely, preference);
+        const result = BrowserExtensionHostKindPicker_1.pickRunningLocation(extensionKinds, isInstalledLocally, isInstalledRemotely, preference);
         this._logService.trace(`pickRunningLocation for ${extensionId.value}, extension kinds: [${extensionKinds.join(', ')}], isInstalledLocally: ${isInstalledLocally}, isInstalledRemotely: ${isInstalledRemotely}, preference: ${extensionRunningPreferenceToString(preference)} => ${extensionHostKindToString(result)}`);
         return result;
     }
@@ -136,7 +137,7 @@ let BrowserExtensionHostKindPicker = class BrowserExtensionHostKindPicker {
         return (result.length > 0 ? result[0] : null);
     }
 };
-BrowserExtensionHostKindPicker = ( __decorate([
+BrowserExtensionHostKindPicker = BrowserExtensionHostKindPicker_1 = ( __decorate([
     ( __param(0, ILogService))
 ], BrowserExtensionHostKindPicker));
 export { BrowserExtensionHostFactory, BrowserExtensionHostKindPicker };

package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js

@@ -9,6 +9,7 @@ import { Extensions } from '../../../common/contributions.js';
 import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { IsWebContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
+var ExtensionUrlBootstrapHandler_1;
 const USER_TRUSTED_EXTENSIONS_STORAGE_KEY = 'extensionUrlHandler.confirmedExtensions';
 function isExtensionId(value) {
     return /^[a-z0-9][a-z0-9\-]*\.[a-z0-9][a-z0-9\-]*$/i.test(value);
@@ -38,25 +39,26 @@ class UserTrustedExtensionIdStorage {
 }
 const IExtensionUrlHandler = ( createDecorator('extensionUrlHandler'));
 let ExtensionUrlBootstrapHandler = class ExtensionUrlBootstrapHandler {
+    static { ExtensionUrlBootstrapHandler_1 = this; }
     static { this._cache = []; }
     static get cache() {
-        ExtensionUrlBootstrapHandler.disposable.dispose();
-        const result = ExtensionUrlBootstrapHandler._cache;
-        ExtensionUrlBootstrapHandler._cache = [];
+        ExtensionUrlBootstrapHandler_1.disposable.dispose();
+        const result = ExtensionUrlBootstrapHandler_1._cache;
+        ExtensionUrlBootstrapHandler_1._cache = [];
         return result;
     }
     constructor(urlService) {
-        ExtensionUrlBootstrapHandler.disposable = urlService.registerHandler(this);
+        ExtensionUrlBootstrapHandler_1.disposable = urlService.registerHandler(this);
     }
     async handleURL(uri, options) {
         if (!isExtensionId(uri.authority)) {
             return false;
         }
-        ExtensionUrlBootstrapHandler._cache.push([uri, options]);
+        ExtensionUrlBootstrapHandler_1._cache.push([uri, options]);
         return true;
     }
 };
-ExtensionUrlBootstrapHandler = ( __decorate([
+ExtensionUrlBootstrapHandler = ExtensionUrlBootstrapHandler_1 = ( __decorate([
     ( __param(0, IURLService))
 ], ExtensionUrlBootstrapHandler));
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));

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

@@ -152,4 +152,4 @@ declare class DeltaExtensionsQueueItem {
     constructor(toAdd: IExtension[], toRemove: string[] | IExtension[]);
 }
 
-export { AbstractExtensionService, DeltaExtensionsQueueItem, IExtensionHostFactory, ResolvedExtensions };
+export { AbstractExtensionService, DeltaExtensionsQueueItem, type IExtensionHostFactory, ResolvedExtensions };

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

@@ -37,9 +37,10 @@ import { checkActivateWorkspaceContainsExtension, checkGlobFileExists } from './
 import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+var AbstractExtensionService_1;
 const hasOwnProperty = Object.hasOwnProperty;
 const NO_OP_VOID_PROMISE = Promise.resolve(undefined);
-let AbstractExtensionService = class AbstractExtensionService extends Disposable {
+let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtensionService extends Disposable {
     constructor(_extensionsProposedApi, _extensionHostFactory, _extensionHostKindPicker, _instantiationService, _notificationService, _environmentService, _telemetryService, _extensionEnablementService, _fileService, _productService, _extensionManagementService, _contextService, _configurationService, _extensionManifestPropertiesService, _logService, _remoteAgentService, _remoteExtensionsScannerService, _lifecycleService, _remoteAuthorityResolverService, _dialogService) {
         super();
         this._extensionsProposedApi = _extensionsProposedApi;
@@ -817,7 +818,7 @@ let AbstractExtensionService = class AbstractExtensionService extends Disposable
         for (const extensionPoint of extensionPoints) {
             if (affectedExtensionPoints[extensionPoint.name]) {
                 performance.mark(`code/willHandleExtensionPoint/${extensionPoint.name}`);
-                AbstractExtensionService._handleExtensionPoint(extensionPoint, availableExtensions, messageHandler);
+                AbstractExtensionService_1._handleExtensionPoint(extensionPoint, availableExtensions, messageHandler);
                 performance.mark(`code/didHandleExtensionPoint/${extensionPoint.name}`);
             }
         }
@@ -917,7 +918,7 @@ let AbstractExtensionService = class AbstractExtensionService extends Disposable
         this._onDidChangeExtensionsStatus.fire([extensionId]);
     }
 };
-AbstractExtensionService = ( (__decorate([
+AbstractExtensionService = AbstractExtensionService_1 = ( (__decorate([
     ( (__param(3, IInstantiationService))),
     ( (__param(4, INotificationService))),
     ( (__param(5, IWorkbenchEnvironmentService))),

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

@@ -40,4 +40,4 @@ interface IActivationEventsReader {
     readActivationEvents(extensionDescription: IExtensionDescription): string[] | undefined;
 }
 
-export { DeltaExtensionsResult, ExtensionDescriptionRegistry, IActivationEventsReader, IReadOnlyExtensionDescriptionRegistry };
+export { DeltaExtensionsResult, ExtensionDescriptionRegistry, type IActivationEventsReader, type IReadOnlyExtensionDescriptionRegistry };

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

@@ -15,4 +15,4 @@ interface IExtensionHostKindPicker {
     pickExtensionHostKind(extensionId: ExtensionIdentifier, extensionKinds: ExtensionKind[], isInstalledLocally: boolean, isInstalledRemotely: boolean, preference: ExtensionRunningPreference): ExtensionHostKind | null;
 }
 
-export { ExtensionHostKind, ExtensionRunningPreference, IExtensionHostKindPicker };
+export { ExtensionHostKind, ExtensionRunningPreference, type IExtensionHostKindPicker };

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

@@ -34,4 +34,4 @@ interface IExtensionHostManager {
     }): Promise<void>;
 }
 
-export { IExtensionHostManager };
+export type { IExtensionHostManager };

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

@@ -18,13 +18,14 @@ import { ExtHostCustomersRegistry } from './extHostCustomers.js';
 import { extensionHostKindToString } from './extensionHostKind.js';
 import { ExtensionHostExtensions } from './extensions.js';
 import { RPCProtocol } from './rpcProtocol.js';
+var ExtensionHostManager_1;
 function createExtensionHostManager(instantiationService, extensionHost, initialActivationEvents, internalExtensionService) {
     if (extensionHost.startup === 3  && initialActivationEvents.length === 0) {
         return instantiationService.createInstance(LazyCreateExtensionHostManager, extensionHost, internalExtensionService);
     }
     return instantiationService.createInstance(ExtensionHostManager, extensionHost, initialActivationEvents, internalExtensionService);
 }
-let ExtensionHostManager = class ExtensionHostManager extends Disposable {
+let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager extends Disposable {
     get kind() {
         return this._extensionHost.runningLocation.kind;
     }
@@ -150,14 +151,14 @@ let ExtensionHostManager = class ExtensionHostManager extends Disposable {
         const sw = StopWatch.create();
         await proxy.test_up(buff);
         sw.stop();
-        return ExtensionHostManager._convert(SIZE, sw.elapsed());
+        return ExtensionHostManager_1._convert(SIZE, sw.elapsed());
     }
     async _measureDown(proxy) {
         const SIZE = 10 * 1024 * 1024;
         const sw = StopWatch.create();
         await proxy.test_down(SIZE);
         sw.stop();
-        return ExtensionHostManager._convert(SIZE, sw.elapsed());
+        return ExtensionHostManager_1._convert(SIZE, sw.elapsed());
     }
     _createExtensionHostCustomers(kind, protocol) {
         let logger = null;
@@ -348,7 +349,7 @@ let ExtensionHostManager = class ExtensionHostManager extends Disposable {
         return proxy.setRemoteEnvironment(env);
     }
 };
-ExtensionHostManager = ( (__decorate([
+ExtensionHostManager = ExtensionHostManager_1 = ( (__decorate([
     ( (__param(3, IInstantiationService))),
     ( (__param(4, IWorkbenchEnvironmentService))),
     ( (__param(5, ITelemetryService))),

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

@@ -85,4 +85,4 @@ declare enum UIKind {
     Web = 2
 }
 
-export { IEnvironment, IExtensionDescriptionDelta, IExtensionHostInitData, IStaticWorkspaceData, MessagePortLike, UIKind };
+export { type IEnvironment, type IExtensionDescriptionDelta, type IExtensionHostInitData, type IStaticWorkspaceData, type MessagePortLike, UIKind };

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

@@ -14,4 +14,4 @@ interface IResolveAuthorityOKResult {
 }
 type IResolveAuthorityResult = IResolveAuthorityErrorResult | IResolveAuthorityOKResult;
 
-export { IResolveAuthorityErrorResult, IResolveAuthorityOKResult, IResolveAuthorityResult };
+export type { IResolveAuthorityErrorResult, IResolveAuthorityOKResult, IResolveAuthorityResult };

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

@@ -22,4 +22,4 @@ declare class RemoteRunningLocation {
 }
 type ExtensionRunningLocation = LocalProcessRunningLocation | LocalWebWorkerRunningLocation | RemoteRunningLocation;
 
-export { ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation };
+export { type ExtensionRunningLocation, LocalProcessRunningLocation, LocalWebWorkerRunningLocation, RemoteRunningLocation };

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

@@ -233,4 +233,4 @@ interface IExtensionService {
     }): Promise<void>;
 }
 
-export { ActivationKind, ActivationTimes, ExtensionActivationReason, ExtensionHostExtensions, ExtensionHostStartup, ExtensionPointContribution, IExtensionHost, IExtensionService, IExtensionsStatus, IMessage, IResponsiveStateChangeEvent, IWillActivateEvent, MissingExtensionDependency, WillStopExtensionHostsEvent };
+export { ActivationKind, ActivationTimes, type ExtensionActivationReason, ExtensionHostExtensions, ExtensionHostStartup, ExtensionPointContribution, type IExtensionHost, IExtensionService, type IExtensionsStatus, type IMessage, type IResponsiveStateChangeEvent, type IWillActivateEvent, MissingExtensionDependency, type WillStopExtensionHostsEvent };

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

@@ -1,7 +1,13 @@
 const allApiProposals = ( Object.freeze({
+    aiRelatedInformation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.aiRelatedInformation.d.ts',
     authGetSessions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authGetSessions.d.ts',
     authSession: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
     canonicalUriProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
+    chat: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chat.d.ts',
+    chatProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
+    chatRequestAccess: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatRequestAccess.d.ts',
+    chatSlashCommands: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSlashCommands.d.ts',
+    chatVariables: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatVariables.d.ts',
     codiconDecoration: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.codiconDecoration.d.ts',
     commentsDraftState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.commentsDraftState.d.ts',
     contribCommentEditorActionsMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribCommentEditorActionsMenu.d.ts',
@@ -27,8 +33,6 @@ const allApiProposals = ( Object.freeze({
     dropMetadata: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.dropMetadata.d.ts',
     editSessionIdentityProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
     editorInsets: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
-    envCollectionOptions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envCollectionOptions.d.ts',
-    envCollectionWorkspace: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envCollectionWorkspace.d.ts',
     envShellEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envShellEvent.d.ts',
     extensionRuntime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
     extensionsAny: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
@@ -36,18 +40,17 @@ const allApiProposals = ( Object.freeze({
     fileComments: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileComments.d.ts',
     fileSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider.d.ts',
     findTextInFiles: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.findTextInFiles.d.ts',
-    formatMultipleRanges: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.formatMultipleRanges.d.ts',
     fsChunks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
     handleIssueUri: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts',
     idToken: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
     indentSize: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.indentSize.d.ts',
     inlineCompletionsAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
     interactive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
-    interactiveSlashCommands: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveSlashCommands.d.ts',
     interactiveUserActions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveUserActions.d.ts',
     interactiveWindow: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
     ipc: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
     languageConfigurationAutoClosingPairs: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageConfigurationAutoClosingPairs.d.ts',
+    mappedEditsProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
     notebookCellExecutionState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
     notebookCodeActions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCodeActions.d.ts',
     notebookControllerAffinityHidden: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
@@ -69,17 +72,19 @@ const allApiProposals = ( Object.freeze({
     scmSelectedProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
     scmTextDocument: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
     scmValidation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
-    semanticSimilarity: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.semanticSimilarity.d.ts',
     shareProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
     showLocal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
     tabInputTextMerge: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
     taskPresentationGroup: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
     telemetry: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
+    terminalContextMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalContextMenu.d.ts',
     terminalDataWriteEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts',
     terminalDimensions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts',
+    terminalExecuteCommandEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',
     terminalQuickFixProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalQuickFixProvider.d.ts',
     terminalSelection: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalSelection.d.ts',
     testCoverage: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testCoverage.d.ts',
+    testMessageContextValue: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testMessageContextValue.d.ts',
     testObserver: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
     textSearchProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchProvider.d.ts',
     timeline: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.timeline.d.ts',

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

@@ -31,4 +31,4 @@ declare class ExtensionPointUserDelta<T> {
     constructor(added: readonly IExtensionPointUser<T>[], removed: readonly IExtensionPointUser<T>[]);
 }
 
-export { ExtensionMessageCollector, ExtensionPointUserDelta, IExtensionPoint, IExtensionPointHandler, IExtensionPointUser };
+export { ExtensionMessageCollector, ExtensionPointUserDelta, type IExtensionPoint, type IExtensionPointHandler, type IExtensionPointUser };

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

@@ -720,6 +720,15 @@ const schema = {
                     '{Locked="vscode.l10n API"}'
                 ]
             }, 'The relative path to a folder containing localization (bundle.l10n.*.json) files. Must be specified if you are using the vscode.l10n API.'))
+        },
+        pricing: {
+            type: 'string',
+            markdownDescription: ( nls.localize(
+                'vscode.extension.pricing',
+                'The pricing information for the extension. Can be Free (default) or Trial. For more details visit: https://code.visualstudio.com/api/working-with-extensions/publishing-extension#extension-pricing-label'
+            )),
+            enum: ['Free', 'Trial'],
+            default: 'Free'
         }
     }
 };

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

@@ -41,4 +41,4 @@ type Proxied<T> = {
     }) => Promise<Dto<Awaited<R>>> : never;
 };
 
-export { Dto, IRPCProtocol, Proxied, ProxyIdentifier };
+export { type Dto, type IRPCProtocol, type Proxied, ProxyIdentifier };

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.d.ts

@@ -32,4 +32,4 @@ interface IFilesConfigurationService {
     preventSaveConflicts(resource: URI, language?: string): boolean;
 }
 
-export { AutoSaveMode, IAutoSaveConfiguration, IFilesConfigurationService };
+export { AutoSaveMode, type IAutoSaveConfiguration, IFilesConfigurationService };

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js

@@ -14,10 +14,11 @@ import { IdleValue } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
 import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { withNullAsUndefined } from 'monaco-editor/esm/vs/base/common/types.js';
+var FilesConfigurationService_1;
 const AutoSaveAfterShortDelayContext = ( new RawContextKey('autoSaveAfterShortDelayContext', false, true));
 const IFilesConfigurationService = ( createDecorator('filesConfigurationService'));
 let FilesConfigurationService = class FilesConfigurationService extends Disposable {
+    static { FilesConfigurationService_1 = this; }
     static { this.DEFAULT_AUTO_SAVE_MODE = isWeb ? AutoSaveConfiguration.AFTER_DELAY : AutoSaveConfiguration.OFF; }
     static { this.READONLY_MESSAGES = {
         providerReadonly: { value: ( localize(
@@ -77,24 +78,24 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
     isReadonly(resource, stat) {
         const provider = this.fileService.getProvider(resource.scheme);
         if (provider && hasReadonlyCapability(provider)) {
-            return provider.readOnlyMessage ?? FilesConfigurationService.READONLY_MESSAGES.providerReadonly;
+            return provider.readOnlyMessage ?? FilesConfigurationService_1.READONLY_MESSAGES.providerReadonly;
         }
         const sessionReadonlyOverride = this.sessionReadonlyOverrides.get(resource);
         if (typeof sessionReadonlyOverride === 'boolean') {
-            return sessionReadonlyOverride === true ? FilesConfigurationService.READONLY_MESSAGES.sessionReadonly : false;
+            return sessionReadonlyOverride === true ? FilesConfigurationService_1.READONLY_MESSAGES.sessionReadonly : false;
         }
         if (this.uriIdentityService.extUri.isEqualOrParent(resource, this.environmentService.userRoamingDataHome) ||
-            this.uriIdentityService.extUri.isEqual(resource, withNullAsUndefined(this.contextService.getWorkspace().configuration))) {
+            this.uriIdentityService.extUri.isEqual(resource, this.contextService.getWorkspace().configuration ?? undefined)) {
             return false;
         }
         if (this.readonlyIncludeMatcher.value.matches(resource)) {
-            return !this.readonlyExcludeMatcher.value.matches(resource) ? FilesConfigurationService.READONLY_MESSAGES.configuredReadonly : false;
+            return !this.readonlyExcludeMatcher.value.matches(resource) ? FilesConfigurationService_1.READONLY_MESSAGES.configuredReadonly : false;
         }
         if (this.configuredReadonlyFromPermissions && stat?.locked) {
-            return FilesConfigurationService.READONLY_MESSAGES.fileLocked;
+            return FilesConfigurationService_1.READONLY_MESSAGES.fileLocked;
         }
         if (stat?.readonly) {
-            return FilesConfigurationService.READONLY_MESSAGES.fileReadonly;
+            return FilesConfigurationService_1.READONLY_MESSAGES.fileReadonly;
         }
         return false;
     }
@@ -124,7 +125,7 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         }));
     }
     onFilesConfigurationChange(configuration) {
-        const autoSaveMode = configuration?.files?.autoSave || FilesConfigurationService.DEFAULT_AUTO_SAVE_MODE;
+        const autoSaveMode = configuration?.files?.autoSave || FilesConfigurationService_1.DEFAULT_AUTO_SAVE_MODE;
         switch (autoSaveMode) {
             case AutoSaveConfiguration.AFTER_DELAY:
                 this.configuredAutoSaveDelay = configuration?.files?.autoSaveDelay;
@@ -210,7 +211,7 @@ let FilesConfigurationService = class FilesConfigurationService extends Disposab
         return this.configurationService.getValue('files.saveConflictResolution', { resource, overrideIdentifier: language }) !== 'overwriteFileOnDisk';
     }
 };
-FilesConfigurationService = ( __decorate([
+FilesConfigurationService = FilesConfigurationService_1 = ( __decorate([
     ( __param(0, IContextKeyService)),
     ( __param(1, IConfigurationService)),
     ( __param(2, IWorkspaceContextService)),