@codingame/monaco-vscode-extensions-service-override 22.1.9 → 23.0.0

package/vscode/src/vs/workbench/api/browser/mainThreadMcp.js

@@ -20,6 +20,7 @@ import { IAuthenticationMcpAccessService } from '@codingame/monaco-vscode-api/vs
 import { IAuthenticationMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service';
 import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
+import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service';
 import { ExtensionHostKind, extensionHostKindToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -27,7 +28,7 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let MainThreadMcp = class MainThreadMcp extends Disposable {
-    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService, _extensionService, _contextKeyService) {
+    constructor(_extHostContext, _mcpRegistry, dialogService, _authenticationService, authenticationMcpServersService, authenticationMCPServerAccessService, authenticationMCPServerUsageService, _dynamicAuthenticationProviderStorageService, _extensionService, _contextKeyService) {
         super();
         this._extHostContext = _extHostContext;
         this._mcpRegistry = _mcpRegistry;
@@ -36,6 +37,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         this.authenticationMcpServersService = authenticationMcpServersService;
         this.authenticationMCPServerAccessService = authenticationMCPServerAccessService;
         this.authenticationMCPServerUsageService = authenticationMCPServerUsageService;
+        this._dynamicAuthenticationProviderStorageService = _dynamicAuthenticationProviderStorageService;
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
         this._serverIdCounter = 0;
@@ -89,7 +91,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             const serverDefinitions = observableValue('mcpServers', servers);
             const extensionId = ( new ExtensionIdentifier(collection.extensionId));
             const store = ( new DisposableStore());
-            const handle = ( new MutableDisposable());
+            const handle = store.add(( new MutableDisposable()));
             const register = () => {
                 handle.value ??= this._mcpRegistry.registerCollection({
                     ...collection,
@@ -153,22 +155,27 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     $onDidReceiveMessage(id, message) {
         this._servers.get(id)?.pushMessage(message);
     }
-    async $getTokenFromServerMetadata(id, authServerComponents, serverMetadata, resourceMetadata, errorOnUserInteraction) {
+    async $getTokenFromServerMetadata(id, authDetails, { errorOnUserInteraction, forceNewRegistration } = {}) {
         const server = this._serverDefinitions.get(id);
         if (!server) {
             return undefined;
         }
-        const authorizationServer = URI.revive(authServerComponents);
-        const scopesSupported = resourceMetadata?.scopes_supported || serverMetadata.scopes_supported || [];
+        const authorizationServer = URI.revive(authDetails.authorizationServer);
+        const resolvedScopes = authDetails.scopes ?? authDetails.resourceMetadata?.scopes_supported ?? authDetails.authorizationServerMetadata.scopes_supported ?? [];
         let providerId = await this._authenticationService.getOrActivateProviderIdForServer(authorizationServer);
+        if (forceNewRegistration && providerId) {
+            this._authenticationService.unregisterAuthenticationProvider(providerId);
+            await this._dynamicAuthenticationProviderStorageService.removeDynamicProvider(providerId);
+            providerId = undefined;
+        }
         if (!providerId) {
-            const provider = await this._authenticationService.createDynamicAuthenticationProvider(authorizationServer, serverMetadata, resourceMetadata);
+            const provider = await this._authenticationService.createDynamicAuthenticationProvider(authorizationServer, authDetails.authorizationServerMetadata, authDetails.resourceMetadata);
             if (!provider) {
                 return undefined;
             }
             providerId = provider.id;
         }
-        const sessions = await this._authenticationService.getSessions(providerId, scopesSupported, { authorizationServer: authorizationServer }, true);
+        const sessions = await this._authenticationService.getSessions(providerId, resolvedScopes, { authorizationServer: authorizationServer }, true);
         const accountNamePreference = this.authenticationMcpServersService.getAccountPreference(server.id, providerId);
         let matchingAccountPreferenceSession;
         if (accountNamePreference) {
@@ -178,11 +185,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         let session;
         if (sessions.length) {
             if (matchingAccountPreferenceSession && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, server.id)) {
-                this.authenticationMCPServerUsageService.addAccountUsage(providerId, matchingAccountPreferenceSession.account.label, scopesSupported, server.id, server.label);
+                this.authenticationMCPServerUsageService.addAccountUsage(providerId, matchingAccountPreferenceSession.account.label, resolvedScopes, server.id, server.label);
                 return matchingAccountPreferenceSession.accessToken;
             }
             if (!provider.supportsMultipleAccounts && this.authenticationMCPServerAccessService.isAccessAllowed(providerId, sessions[0].account.label, server.id)) {
-                this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, scopesSupported, server.id, server.label);
+                this.authenticationMCPServerUsageService.addAccountUsage(providerId, sessions[0].account.label, resolvedScopes, server.id, server.label);
                 return sessions[0].accessToken;
             }
         }
@@ -198,7 +205,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
                 throw ( new UserInteractionRequiredError('authentication'));
             }
             session = provider.supportsMultipleAccounts
-                ? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, scopesSupported, sessions)
+                ? await this.authenticationMcpServersService.selectSession(providerId, server.id, server.label, resolvedScopes, sessions)
                 : sessions[0];
         }
         else {
@@ -207,7 +214,7 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             }
             const accountToCreate = matchingAccountPreferenceSession?.account;
             do {
-                session = await this._authenticationService.createSession(providerId, scopesSupported, {
+                session = await this._authenticationService.createSession(providerId, resolvedScopes, {
                     activateImmediate: true,
                     account: accountToCreate,
                     authorizationServer
@@ -218,14 +225,14 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
         }
         this.authenticationMCPServerAccessService.updateAllowedMcpServers(providerId, session.account.label, [{ id: server.id, name: server.label, allowed: true }]);
         this.authenticationMcpServersService.updateAccountPreference(server.id, providerId, session.account);
-        this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, scopesSupported, server.id, server.label);
+        this.authenticationMCPServerUsageService.addAccountUsage(providerId, session.account.label, resolvedScopes, server.id, server.label);
         return session.accessToken;
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2491, "Incorrect account detected")),
+            message: ( localize(2503, "Incorrect account detected")),
             detail: ( localize(
-                2492,
+                2504,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -234,11 +241,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2493, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2505, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2494, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2506, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -251,20 +258,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2495,
+            2507,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2496,
+            2508,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2497, "&&Allow")),
+                label: ( localize(2509, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -295,8 +302,9 @@ MainThreadMcp = __decorate([
     ( __param(4, IAuthenticationMcpService)),
     ( __param(5, IAuthenticationMcpAccessService)),
     ( __param(6, IAuthenticationMcpUsageService)),
-    ( __param(7, IExtensionService)),
-    ( __param(8, IContextKeyService))
+    ( __param(7, IDynamicAuthenticationProviderStorageService)),
+    ( __param(8, IExtensionService)),
+    ( __param(9, IContextKeyService))
 ], MainThreadMcp);
 class ExtHostMcpServerLaunch extends Disposable {
     pushLog(level, message) {

package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js

@@ -60,13 +60,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2498, "Extension"));
+                source = ( localize(2510, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2499, "Manage Extension")),
+                    label: ( localize(2511, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -103,13 +103,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2500, "Cancel")),
+                    label: ( localize(2512, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2501, "&&OK")),
+                    label: ( localize(2513, "&&OK")),
                     run: () => undefined
                 };
             }

package/vscode/src/vs/workbench/api/browser/mainThreadNotebook.js

@@ -11,7 +11,7 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { INotebookCellStatusBarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { SimpleNotebookProviderInfo } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookService';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
@@ -183,10 +183,8 @@ CommandsRegistry.registerCommand('_executeDataToNotebook', async (accessor, ...a
     const dto = await info.serializer.dataToNotebook(bytes);
     return ( new SerializableObjectWithBuffers(NotebookDto.toNotebookDataDto(dto)));
 });
-CommandsRegistry.registerCommand('_executeNotebookToData', async (accessor, ...args) => {
-    const [notebookType, dto] = args;
+CommandsRegistry.registerCommand('_executeNotebookToData', async (accessor, notebookType, dto) => {
     assertType(typeof notebookType === 'string', 'string');
-    assertType(typeof dto === 'object');
     const notebookService = accessor.get(INotebookService);
     const info = await notebookService.withNotebookDataProvider(notebookType);
     if (!(info instanceof SimpleNotebookProviderInfo)) {
@@ -197,7 +195,8 @@ CommandsRegistry.registerCommand('_executeNotebookToData', async (accessor, ...a
     return bytes;
 });
 function isFileOperationError(error) {
-    return typeof error.fileOperationResult === 'number' && typeof error.message === 'string';
+    const candidate = error;
+    return typeof candidate?.fileOperationResult === 'number' && typeof candidate?.message === 'string';
 }
 
 export { MainThreadNotebooks };

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.js

@@ -8,8 +8,8 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.d.ts

@@ -1,8 +1,8 @@
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
-import { ICellRange } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
+import { ICellRange } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookRange";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookEditors.js

@@ -5,9 +5,9 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objec
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.d.ts

@@ -26,7 +26,7 @@ export declare class MainThreadNotebookKernels implements MainThreadNotebookKern
     dispose(): void;
     private _onEditorAdd;
     private _onEditorRemove;
-    $postMessage(handle: number, editorId: string | undefined, message: any): Promise<boolean>;
+    $postMessage(handle: number, editorId: string | undefined, message: unknown): Promise<boolean>;
     private variableRequestIndex;
     private variableRequestMap;
     $receiveVariable(requestId: string, variable: VariablesResult): void;

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookKernels.js

@@ -14,7 +14,7 @@ import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vsc
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { AsyncIterableSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { AsyncIterableProducer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 
 class MainThreadKernel {
     get preloadUris() {
@@ -176,9 +176,9 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
         return didSend;
     }
     $receiveVariable(requestId, variable) {
-        const source = this.variableRequestMap.get(requestId);
-        if (source) {
-            source.emitOne(variable);
+        const emitter = this.variableRequestMap.get(requestId);
+        if (emitter) {
+            emitter.emitOne(variable);
         }
     }
     async $addKernel(handle, data) {
@@ -192,19 +192,15 @@ let MainThreadNotebookKernels = class MainThreadNotebookKernels {
             }
             provideVariables(notebookUri, parentId, kind, start, token) {
                 const requestId = `${handle}variables${that.variableRequestIndex++}`;
-                if (( that.variableRequestMap.has(requestId))) {
-                    return that.variableRequestMap.get(requestId).asyncIterable;
-                }
-                const source = ( new AsyncIterableSource());
-                that.variableRequestMap.set(requestId, source);
-                that._proxy.$provideVariables(handle, requestId, notebookUri, parentId, kind, start, token).then(() => {
-                    source.resolve();
-                    that.variableRequestMap.delete(requestId);
-                }).catch((err) => {
-                    source.reject(err);
-                    that.variableRequestMap.delete(requestId);
-                });
-                return source.asyncIterable;
+                return ( new AsyncIterableProducer(async (emitter) => {
+                    that.variableRequestMap.set(requestId, emitter);
+                    try {
+                        await that._proxy.$provideVariables(handle, requestId, notebookUri, parentId, kind, start, token);
+                    }
+                    finally {
+                        that.variableRequestMap.delete(requestId);
+                    }
+                }));
             }
         })(data, this._languageService);
         const disposables = this._disposables.add(( new DisposableStore()));

package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js

@@ -6,7 +6,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2502, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2514, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;

package/vscode/src/vs/workbench/api/browser/mainThreadOutputService.js

@@ -69,11 +69,11 @@ let MainThreadOutputService = class MainThreadOutputService extends Disposable {
     }
     _showChannelQuietly(channel) {
         const statusProperties = {
-            name: ( localize(2503, "Show Output")),
+            name: ( localize(2515, "Show Output")),
             text: '$(output)',
-            ariaLabel: ( localize(2504, "Show {0} Output Channel", channel.label)),
+            ariaLabel: ( localize(2516, "Show {0} Output Channel", channel.label)),
             command: `workbench.action.output.show.${channel.id}`,
-            tooltip: ( localize(2505, "Show {0} Output Channel", channel.label)),
+            tooltip: ( localize(2517, "Show {0} Output Channel", channel.label)),
             kind: 'prominent'
         };
         if (!this._outputStatusItem.value) {

package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js

@@ -37,7 +37,7 @@ let MainThreadProgress = class MainThreadProgress {
                 location: ProgressLocation.Notification,
                 secondaryActions: [toAction({
                         id: extensionId,
-                        label: ( localize(2506, "Manage Extension")),
+                        label: ( localize(2518, "Manage Extension")),
                         run: () => this._commandService.executeCommand('_extensions.manage', extensionId)
                     })]
             };

package/vscode/src/vs/workbench/api/browser/mainThreadQuickOpen.d.ts

@@ -1,13 +1,21 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IPickOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-import { MainThreadQuickOpenShape, TransferQuickPickItem, TransferQuickInput, IInputBoxOptions, TransferQuickPickItemOrSeparator } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { ICustomEditorLabelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/customEditorLabelService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { IInputBoxOptions, MainThreadQuickOpenShape, TransferQuickInput, TransferQuickPickItem, TransferQuickPickItemOrSeparator } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadQuickOpen implements MainThreadQuickOpenShape {
+    private readonly labelService;
+    private readonly customEditorLabelService;
+    private readonly modelService;
+    private readonly languageService;
     private readonly _proxy;
     private readonly _quickInputService;
     private readonly _items;
-    constructor(extHostContext: IExtHostContext, quickInputService: IQuickInputService);
+    constructor(extHostContext: IExtHostContext, quickInputService: IQuickInputService, labelService: ILabelService, customEditorLabelService: ICustomEditorLabelService, modelService: IModelService, languageService: ILanguageService);
     dispose(): void;
     $show(instance: number, options: IPickOptions<TransferQuickPickItem>, token: CancellationToken): Promise<number | number[] | undefined>;
     $setItems(instance: number, items: TransferQuickPickItemOrSeparator[]): Promise<void>;
@@ -16,4 +24,17 @@ export declare class MainThreadQuickOpen implements MainThreadQuickOpenShape {
     private sessions;
     $createOrUpdate(params: TransferQuickInput): Promise<void>;
     $dispose(sessionId: number): Promise<void>;
+    /**
+    * Derives icon, label and description for Quick Pick items that represent a resource URI.
+    */
+    private expandItemProps;
+    /**
+    * Converts IconPath DTO into iconPath/iconClass properties.
+    */
+    private expandIconPath;
+    /**
+    * Updates the toggles for a given quick input session by creating new {@link Toggle}-s
+    * from buttons, updating existing toggles props and removing old ones.
+    */
+    private updateToggles;
 }