@codingame/monaco-vscode-extensions-service-override 37.6.1 → 38.0.0

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

@@ -3,12 +3,13 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { extHostNamedCustomer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extHostCustomers';
-import { getDynamicAuthenticationProviderId, isAuthenticationWwwAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
+import { withoutWorkbenchOnlySessionOptions, getDynamicAuthenticationProviderId, isAuthenticationWwwAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { NotificationActionTelemetryId, NotificationTelemetryId } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notificationTelemetry';
 import { ActivationKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -33,13 +34,53 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { mcpEnterpriseManagedAuthIdpSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 
-function reviveSessionAccountIcon(session) {
+function reviveAuthenticationSession(session) {
     return {
         ...session,
         account: {
             ...session.account,
             icon: URI.revive(session.account.icon)
-        }
+        },
+        authorizationServer: URI.revive(session.authorizationServer)
+    };
+}
+function prepareSessionRequest(options) {
+    const {
+        clearSessionPreference,
+        createIfNone,
+        forceNewSession,
+        silent,
+        ...requestOptions
+    } = withoutWorkbenchOnlySessionOptions(options);
+    if (forceNewSession && createIfNone) {
+        throw ( new Error(
+            "Invalid combination of options. Please remove one of the following: forceNewSession, createIfNone"
+        ));
+    }
+    if (forceNewSession && silent) {
+        throw ( new Error(
+            "Invalid combination of options. Please remove one of the following: forceNewSession, silent"
+        ));
+    }
+    if (createIfNone && silent) {
+        throw ( new Error(
+            "Invalid combination of options. Please remove one of the following: createIfNone, silent"
+        ));
+    }
+    const providerOptions = {
+        ...requestOptions,
+        account: requestOptions.account && {
+            ...requestOptions.account,
+            icon: URI.revive(requestOptions.account.icon)
+        },
+        authorizationServer: URI.revive(requestOptions.authorizationServer)
+    };
+    return {
+        clearSessionPreference,
+        createIfNone,
+        forceNewSession,
+        silent,
+        providerOptions
     };
 }
 class MainThreadAuthenticationProvider extends Disposable {
@@ -63,10 +104,10 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async getSessions(scopes, options) {
         const sessions = await this._proxy.$getSessions(this.id, scopes, options);
-        return sessions.map(reviveSessionAccountIcon);
+        return sessions.map(reviveAuthenticationSession);
     }
     async createSession(scopes, options) {
-        return reviveSessionAccountIcon(await this._proxy.$createSession(this.id, scopes, options));
+        return reviveAuthenticationSession(await this._proxy.$createSession(this.id, scopes, options));
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
@@ -94,10 +135,10 @@ class MainThreadAuthenticationProviderWithChallenges extends MainThreadAuthentic
     }
     async getSessionsFromChallenges(constraint, options) {
         const sessions = await this._proxy.$getSessionsFromChallenges(this.id, constraint, options);
-        return sessions.map(reviveSessionAccountIcon);
+        return sessions.map(reviveAuthenticationSession);
     }
     async createSessionFromChallenges(constraint, options) {
-        return reviveSessionAccountIcon(
+        return reviveAuthenticationSession(
             await this._proxy.$createSessionFromChallenges(this.id, constraint, options)
         );
     }
@@ -266,9 +307,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const obj = this._registrations.get(providerId);
         if (obj instanceof Emitter) {
             obj.fire({
-                added: event.added?.map(reviveSessionAccountIcon),
-                removed: event.removed?.map(reviveSessionAccountIcon),
-                changed: event.changed?.map(reviveSessionAccountIcon)
+                added: event.added?.map(reviveAuthenticationSession),
+                removed: event.removed?.map(reviveAuthenticationSession),
+                changed: event.changed?.map(reviveAuthenticationSession)
             });
         }
     }
@@ -294,17 +335,21 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(5036, "Yes"));
-        const no = ( localize(5037, "No"));
+        const yes = ( localize(6357, "Yes"));
+        const no = ( localize(6358, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
+            telemetryId: NotificationActionTelemetryId.Continue,
             label: yes,
             run: () => result = true
         }, {
+            telemetryId: NotificationActionTelemetryId.Decline,
             label: no,
             run: () => result = false
-        }]);
+        }], {
+            telemetry: NotificationTelemetryId.AuthenticationContinue
+        });
         const disposable = handle.onDidClose(() => {
             deferredPromise.complete(result);
             disposable.dispose();
@@ -351,26 +396,26 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             message = customMessage;
         } else {
             message = recreatingSession ? ( localize(
-                5038,
+                6359,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             )) : ( localize(
-                5039,
+                6360,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
             ));
         }
         const buttons = [{
-            label: ( localize(5040, "&&Allow")),
+            label: ( localize(6361, "&&Allow")),
             run() {
                 return true;
             }
         }];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(5041, "Learn more")),
+                label: ( localize(6362, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), {
@@ -393,9 +438,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(5042, "Incorrect account detected")),
+            message: ( localize(6363, "Incorrect account detected")),
             detail: ( localize(
-                5043,
+                6364,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -403,10 +448,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             type: Severity.Warning,
             cancelButton: true,
             buttons: [{
-                label: ( localize(5044, "Keep {0}", chosenAccountLabel)),
+                label: ( localize(6365, "Keep {0}", chosenAccountLabel)),
                 run: () => chosenAccountLabel
             }, {
-                label: ( localize(5045, "Login with {0}", requestedAccountLabel)),
+                label: ( localize(6366, "Login with {0}", requestedAccountLabel)),
                 run: () => requestedAccountLabel
             }]
         });
@@ -416,33 +461,24 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return result.result === chosenAccountLabel;
     }
     async doGetSession(providerId, scopeListOrRequest, extensionId, extensionName, options) {
-        const authorizationServer = URI.revive(options.authorizationServer);
+        const {
+            clearSessionPreference,
+            createIfNone,
+            forceNewSession,
+            silent,
+            providerOptions
+        } = prepareSessionRequest(options);
         const sessions = await this.authenticationService.getSessions(providerId, scopeListOrRequest, {
-            account: options.account,
-            authorizationServer
+            ...providerOptions,
+            silent: !createIfNone && !forceNewSession
         }, true);
         const provider = this.authenticationService.getProvider(providerId);
-        if (options.forceNewSession && options.createIfNone) {
-            throw ( new Error(
-                "Invalid combination of options. Please remove one of the following: forceNewSession, createIfNone"
-            ));
-        }
-        if (options.forceNewSession && options.silent) {
-            throw ( new Error(
-                "Invalid combination of options. Please remove one of the following: forceNewSession, silent"
-            ));
-        }
-        if (options.createIfNone && options.silent) {
-            throw ( new Error(
-                "Invalid combination of options. Please remove one of the following: createIfNone, silent"
-            ));
-        }
-        if (options.clearSessionPreference) {
+        if (clearSessionPreference) {
             this.authenticationExtensionsService.removeAccountPreference(extensionId, providerId);
         }
         const matchingAccountPreferenceSession =
-        options.account ? sessions[0] : this._getAccountPreference(extensionId, providerId, sessions);
-        if (!options.forceNewSession && sessions.length) {
+        providerOptions.account ? sessions[0] : this._getAccountPreference(extensionId, providerId, sessions);
+        if (!forceNewSession && sessions.length) {
             if (matchingAccountPreferenceSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, extensionId)) {
                 return matchingAccountPreferenceSession;
             }
@@ -450,28 +486,35 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return sessions[0];
             }
         }
-        if (options.createIfNone || options.forceNewSession) {
+        if (createIfNone || forceNewSession) {
             let uiOptions;
-            if (typeof options.forceNewSession === "object") {
-                uiOptions = options.forceNewSession;
-            } else if (typeof options.createIfNone === "object") {
-                uiOptions = options.createIfNone;
+            if (typeof forceNewSession === "object") {
+                uiOptions = forceNewSession;
+            } else if (typeof createIfNone === "object") {
+                uiOptions = createIfNone;
             }
-            const recreatingSession = !!(options.forceNewSession && sessions.length);
+            const recreatingSession = !!(forceNewSession && sessions.length);
             const isAllowed = await this.loginPrompt(provider, extensionName, recreatingSession, uiOptions);
             if (!isAllowed) {
                 throw ( new Error("User did not consent to login."));
             }
             let session;
-            if (sessions?.length && !options.forceNewSession) {
-                session = provider.supportsMultipleAccounts && !options.account ? await this.authenticationExtensionsService.selectSession(providerId, extensionId, extensionName, scopeListOrRequest, sessions) : sessions[0];
+            if (sessions?.length && !forceNewSession) {
+                session = provider.supportsMultipleAccounts && !providerOptions.account ? await this.authenticationExtensionsService.selectSession(
+                    providerId,
+                    extensionId,
+                    extensionName,
+                    scopeListOrRequest,
+                    sessions,
+                    providerOptions
+                ) : sessions[0];
             } else {
-                const accountToCreate = options.account ?? matchingAccountPreferenceSession?.account;
+                const accountToCreate = providerOptions.account ?? matchingAccountPreferenceSession?.account;
                 do {
                     session = await this.authenticationService.createSession(providerId, scopeListOrRequest, {
+                        ...providerOptions,
                         activateImmediate: true,
-                        account: accountToCreate,
-                        authorizationServer
+                        account: accountToCreate
                     });
                 } while (accountToCreate && accountToCreate.label !== session.account.label && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
             }
@@ -480,7 +523,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 name: extensionName,
                 allowed: true
             }]);
-            this.authenticationExtensionsService.updateNewSessionRequests(providerId, [session]);
+            void this.authenticationExtensionsService.updateNewSessionRequests(providerId, [session]).catch(
+                error => this.logService.warn("Failed to update pending authentication requests.", error)
+            );
             this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
             return session;
         }
@@ -492,8 +537,21 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return validSessions[0];
             }
         }
-        if (!options.silent) {
-            sessions.length ? this.authenticationExtensionsService.requestSessionAccess(providerId, extensionId, extensionName, scopeListOrRequest, sessions) : await this.authenticationExtensionsService.requestNewSession(providerId, scopeListOrRequest, extensionId, extensionName);
+        if (!silent) {
+            sessions.length ? this.authenticationExtensionsService.requestSessionAccess(
+                providerId,
+                extensionId,
+                extensionName,
+                scopeListOrRequest,
+                sessions,
+                providerOptions
+            ) : await this.authenticationExtensionsService.requestNewSession(
+                providerId,
+                scopeListOrRequest,
+                extensionId,
+                extensionName,
+                providerOptions
+            );
         }
         return undefined;
     }
@@ -559,15 +617,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             result
         } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(5046, "Device Code Authentication")),
+            message: ( localize(6367, "Device Code Authentication")),
             detail: ( localize(
-                5047,
+                6368,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [{
-                label: ( localize(5048, "Copy & Continue")),
+                label: ( localize(6369, "Copy & Continue")),
                 run: () => true
             }],
             cancelButton: true
@@ -577,7 +635,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 await this.clipboardService.writeText(userCode);
                 return await this.openerService.open(( URI.parse(verificationUri)));
             } catch (error) {
-                this.notificationService.error(( localize(5049, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(6370, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
@@ -586,44 +644,44 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const redirectUrls = "http://127.0.0.1:33418\nhttps://vscode.dev/redirect";
         const result = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(5050, "Dynamic Client Registration not supported")),
+            message: ( localize(6371, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                5051,
+                6372,
                 "The authorization server '{0}' does not support automatic client registration. Do you want to proceed by manually providing a client registration (client ID)?\n\nNote: When registering your OAuth application, make sure to include these redirect URIs:\n{1}",
                 authorizationServerUrl,
                 redirectUrls
             )),
             buttons: [{
-                label: ( localize(5052, "Copy URIs & Proceed")),
+                label: ( localize(6373, "Copy URIs & Proceed")),
                 run: async () => {
                     try {
                         await this.clipboardService.writeText(redirectUrls);
                     } catch (error) {
-                        this.notificationService.error(( localize(5053, "Failed to copy redirect URIs to clipboard.")));
+                        this.notificationService.error(( localize(6374, "Failed to copy redirect URIs to clipboard.")));
                     }
                     return true;
                 }
             }],
             cancelButton: {
-                label: ( localize(5054, "Cancel")),
+                label: ( localize(6375, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(5055, "Add Client Registration Details"));
+        const sharedTitle = ( localize(6376, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                5056,
+                6377,
                 "Enter an existing client ID that has been registered with the following redirect URIs: http://127.0.0.1:33418, https://vscode.dev/redirect"
             )),
-            placeHolder: ( localize(5057, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(6378, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async value => {
                 if (!value || value.trim().length === 0) {
-                    return localize(5058, "Client ID is required");
+                    return localize(6379, "Client ID is required");
                 }
                 return undefined;
             }
@@ -634,11 +692,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                5059,
+                6380,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(5060, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(6381, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });
@@ -649,14 +707,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $promptForResourceClientSecret(resourceClientId, resource) {
         const value = await this.quickInputService.input({
-            title: ( localize(5061, "Resource Client Secret Required")),
+            title: ( localize(6382, "Resource Client Secret Required")),
             prompt: ( localize(
-                5062,
+                6383,
                 "The resource at '{0}' uses a per-resource client identifier '{1}'. Enter the matching client secret (leave blank if none). The value is saved in OS secret storage; manage it later via the 'Set Client Secret' code lens in mcp.json.",
                 resource,
                 resourceClientId
             )),
-            placeHolder: ( localize(5063, "Resource client secret")),
+            placeHolder: ( localize(6384, "Resource client secret")),
             password: true,
             ignoreFocusLost: true
         });
@@ -684,4 +742,4 @@ MainThreadAuthentication = __decorate(
     MainThreadAuthentication
 );
 
-export { MainThreadAuthentication, reviveSessionAccountIcon };
+export { MainThreadAuthentication, reviveAuthenticationSession };

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

@@ -108,7 +108,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (
         !this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest) && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                5064,
+                6385,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

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

@@ -468,7 +468,7 @@ let MainThreadCommentController = class MainThreadCommentController extends Disp
     }
 };
 MainThreadCommentController = ( __decorate([( __param(6, ICommentService)), ( __param(7, IUriIdentityService))], MainThreadCommentController));
-const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(5067, "View icon of the comments view.")));
+const commentsViewIcon = registerIcon("comments-view-icon", Codicon.commentDiscussion, ( localize(6388, "View icon of the comments view.")));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(
         extHostContext,

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

@@ -1,4 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ISelection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
+import { IOutlineService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service";
 import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -25,15 +27,25 @@ export declare class MainThreadCustomEditors extends Disposable implements extHo
     private readonly _webviewWorkbenchService;
     private readonly _uriIdentityService;
     private readonly _untitledTextEditorService;
+    private readonly _outlineService;
     private readonly _proxyCustomEditors;
     private readonly _editorProviders;
+    private readonly _navigation;
+    private readonly _pendingNavigation;
     private readonly _editorRenameBackups;
     private readonly _pendingSideBySideDiffResolutions;
+    /**
+     * Webview handle of each resolved input. An input is resolved again if creating its document failed.
+     */
+    private readonly _webviewHandles;
     private readonly _webviewOriginStore;
-    constructor(context: IExtHostContext, mainThreadWebview: MainThreadWebviews, mainThreadWebviewPanels: MainThreadWebviewPanels, extensionService: IExtensionService, storageService: IStorageService, workingCopyService: IWorkingCopyService, workingCopyFileService: IWorkingCopyFileService, _customEditorService: ICustomEditorService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, _instantiationService: IInstantiationService, _webviewWorkbenchService: IWebviewWorkbenchService, _uriIdentityService: IUriIdentityService, _untitledTextEditorService: IUntitledTextEditorService);
+    constructor(context: IExtHostContext, mainThreadWebview: MainThreadWebviews, mainThreadWebviewPanels: MainThreadWebviewPanels, extensionService: IExtensionService, storageService: IStorageService, workingCopyService: IWorkingCopyService, workingCopyFileService: IWorkingCopyFileService, _customEditorService: ICustomEditorService, _editorGroupService: IEditorGroupsService, _editorService: IEditorService, _instantiationService: IInstantiationService, _webviewWorkbenchService: IWebviewWorkbenchService, _uriIdentityService: IUriIdentityService, _untitledTextEditorService: IUntitledTextEditorService, _outlineService: IOutlineService);
     $registerTextEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: extHostProtocol.IWebviewPanelOptions, capabilities: extHostProtocol.CustomEditorProviderCapabilities, serializeBuffersForPostMessage: boolean): void;
     $registerCustomEditorProvider(extensionData: extHostProtocol.WebviewExtensionDescription, viewType: string, options: extHostProtocol.IWebviewPanelOptions, capabilities: extHostProtocol.CustomEditorProviderCapabilities, supportsMultipleEditorsPerDocument: boolean, serializeBuffersForPostMessage: boolean): void;
     private registerEditorProvider;
+    private getOrAddWebviewInput;
+    private resolveCustomTextEditorNavigation;
+    $onDidChangeCustomTextEditorSelection(handle: extHostProtocol.WebviewHandle, selection: ISelection | undefined): void;
     private resolveCustomEditorSideBySideDiff;
     $unregisterEditorProvider(viewType: string): void;
     private getOrCreateCustomEditorModel;