@codingame/monaco-vscode-api 28.4.1 → 29.0.0

package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js

@@ -42,23 +42,23 @@ const authenticationDefinitionSchema = {
     properties: {
         id: {
             type: "string",
-            description: ( localize(15433, "The id of the authentication provider."))
+            description: ( localize(15729, "The id of the authentication provider."))
         },
         label: {
             type: "string",
-            description: ( localize(15434, "The human readable name of the authentication provider."))
+            description: ( localize(15730, "The human readable name of the authentication provider."))
         },
         authorizationServerGlobs: {
             type: "array",
             items: {
                 type: "string",
                 description: ( localize(
-                    15435,
+                    15731,
                     "A list of globs that match the authorization servers that this provider supports."
                 ))
             },
             description: ( localize(
-                15436,
+                15732,
                 "A list of globs that match the authorization servers that this provider supports."
             ))
         }
@@ -67,7 +67,7 @@ const authenticationDefinitionSchema = {
 const authenticationExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "authentication",
     jsonSchema: {
-        description: ( localize(15437, "Contributes authentication")),
+        description: ( localize(15733, "Contributes authentication")),
         type: "array",
         items: authenticationDefinitionSchema
     },
@@ -145,11 +145,11 @@ let AuthenticationService = class AuthenticationService extends Disposable {
             added.forEach(point => {
                 for (const provider of point.value) {
                     if (isFalsyOrWhitespace(provider.id)) {
-                        point.collector.error(( localize(15438, "An authentication contribution must specify an id.")));
+                        point.collector.error(( localize(15734, "An authentication contribution must specify an id.")));
                         continue;
                     }
                     if (isFalsyOrWhitespace(provider.label)) {
-                        point.collector.error(( localize(15439, "An authentication contribution must specify a label.")));
+                        point.collector.error(( localize(15735, "An authentication contribution must specify a label.")));
                         continue;
                     }
                     if (!( this.declaredProviders.some(p => p.id === provider.id))) {
@@ -157,7 +157,7 @@ let AuthenticationService = class AuthenticationService extends Disposable {
                         this._logService.debug(`Declared authentication provider: ${provider.id}`);
                     } else {
                         point.collector.error(( localize(
-                            15440,
+                            15736,
                             "This authentication id '{0}' has already been registered",
                             provider.id
                         )));
@@ -176,14 +176,14 @@ let AuthenticationService = class AuthenticationService extends Disposable {
     }
     registerDeclaredAuthenticationProvider(provider) {
         if (isFalsyOrWhitespace(provider.id)) {
-            throw ( new Error(( localize(15438, "An authentication contribution must specify an id."))));
+            throw ( new Error(( localize(15734, "An authentication contribution must specify an id."))));
         }
         if (isFalsyOrWhitespace(provider.label)) {
-            throw ( new Error(( localize(15439, "An authentication contribution must specify a label."))));
+            throw ( new Error(( localize(15735, "An authentication contribution must specify a label."))));
         }
         if (( this.declaredProviders.some(p => p.id === provider.id))) {
             throw ( new Error(( localize(
-                15440,
+                15736,
                 "This authentication id '{0}' has already been registered",
                 provider.id
             ))));

package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js

@@ -137,7 +137,7 @@ let AuxiliaryWindow = class AuxiliaryWindow extends BaseWindow {
     preventUnload(e) {
         e.preventDefault();
         e.returnValue = ( localize(
-            15441,
+            15737,
             "Changes that you made may not be saved. Please check press 'Cancel' and try again."
         ));
     }
@@ -205,7 +205,7 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
         mark("code/auxiliaryWindow/willOpen");
         const targetWindow = await this.openWindow(options);
         if (!targetWindow) {
-            throw ( new Error(( localize(15442, "Unable to open a new window."))));
+            throw ( new Error(( localize(15738, "Unable to open a new window."))));
         }
         const resolvedWindowId = await this.resolveWindowId(targetWindow);
         ensureCodeWindow(targetWindow, resolvedWindowId);
@@ -296,20 +296,20 @@ let BrowserAuxiliaryWindowService = class BrowserAuxiliaryWindowService extends
             return (await this.dialogService.prompt({
                 type: Severity$1.Warning,
                 message: ( localize(
-                    15443,
+                    15739,
                     "The browser blocked opening a new window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            15444,
+                            15740,
                             "Please allow pop-ups for this website in your [browser settings]({0}).",
                             "https://aka.ms/allow-vscode-popup"
                         )), true))
                     }]
                 },
                 buttons: [{
-                    label: ( localize(15445, "&&Retry")),
+                    label: ( localize(15741, "&&Retry")),
                     run: () => this.openWindow(options)
                 }],
                 cancelButton: true

package/vscode/src/vs/workbench/services/browserElements/browser/browserElementsService.service.d.ts

@@ -5,6 +5,7 @@ export declare const IBrowserElementsService: import("../../../../platform/insta
 export interface IBrowserElementsService {
     _serviceBrand: undefined;
     getElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined>;
+    getFocusedElementData(rect: IRectangle, token: CancellationToken, locator: IBrowserTargetLocator | undefined): Promise<IElementData | undefined>;
     startDebugSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void>;
     startConsoleSession(token: CancellationToken, locator: IBrowserTargetLocator): Promise<void>;
     getConsoleLogs(locator: IBrowserTargetLocator): Promise<string | undefined>;

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.js

@@ -76,15 +76,15 @@ function isProUser(chatEntitlement) {
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.Pro:
-        return localize(15446, "Copilot Pro");
+        return localize(15742, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(15447, "Copilot Pro+");
+        return localize(15743, "Copilot Pro+");
     case ChatEntitlement.Business:
-        return localize(15448, "Copilot Business");
+        return localize(15744, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(15449, "Copilot Enterprise");
+        return localize(15745, "Copilot Enterprise");
     default:
-        return localize(15450, "Copilot Free");
+        return localize(15746, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -503,7 +503,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
         }
         return quotas;
     }
-    async request(url, type, body, sessions, token) {
+    async request(url, type, body, sessions, token, callSite) {
         let lastRequest;
         for (const session of sessions) {
             if (token.isCancellationRequested) {
@@ -517,7 +517,8 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     disableCache: true,
                     headers: {
                         "Authorization": `Bearer ${session.accessToken}`
-                    }
+                    },
+                    callSite
                 }, token);
                 const status = response.res.statusCode;
                 if (status && status !== 200) {
@@ -569,10 +570,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "POST",
             body,
             sessions,
-            CancellationToken.None
+            CancellationToken.None,
+            "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(15451, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(15747, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -595,7 +597,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(15452, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(15748, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: response.res.statusCode
             };
@@ -605,7 +607,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(15453, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(15749, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -615,7 +617,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             parsedResult = JSON.parse(responseText);
             this.logService.trace(`[chat entitlement] sign-up: response is ${responseText}`);
         } catch (err) {
-            const retry = await this.onUnknownSignUpError(( localize(15454, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(15750, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -646,11 +648,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    15455,
+                    15751,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(15456, "Retry"))
+                primaryButton: ( localize(15752, "Retry"))
             });
             return confirmed;
         }
@@ -662,15 +664,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    15457,
+                    15753,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(15458, "OK")),
+                    label: ( localize(15754, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(15459, "Learn More")),
+                    label: ( localize(15755, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js

@@ -2,18 +2,18 @@
 import { localize } from '../../../../nls.js';
 
 const idDescription = ( localize(
-    15512,
+    15808,
     "The input's id is used to associate an input with a variable of the form ${input:id}."
 ));
-const typeDescription = ( localize(15513, "The type of user input prompt to use."));
-const descriptionDescription = ( localize(15514, "The description is shown when the user is prompted for input."));
-const defaultDescription = ( localize(15515, "The default value for the input."));
+const typeDescription = ( localize(15809, "The type of user input prompt to use."));
+const descriptionDescription = ( localize(15810, "The description is shown when the user is prompted for input."));
+const defaultDescription = ( localize(15811, "The default value for the input."));
 const inputsSchema = {
     definitions: {
         inputs: {
             type: "array",
             description: ( localize(
-                15516,
+                15812,
                 "User inputs. Used for defining user input prompts, such as free string input or a choice from several options."
             )),
             items: {
@@ -31,7 +31,7 @@ const inputsSchema = {
                             description: typeDescription,
                             enum: ["promptString"],
                             enumDescriptions: [( localize(
-                                15517,
+                                15813,
                                 "The 'promptString' type opens an input box to ask the user for input."
                             ))]
                         },
@@ -46,7 +46,7 @@ const inputsSchema = {
                         password: {
                             type: "boolean",
                             description: ( localize(
-                                15518,
+                                15814,
                                 "Controls if a password input is shown. Password input hides the typed text."
                             ))
                         }
@@ -64,7 +64,7 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["pickString"],
-                            enumDescriptions: [( localize(15519, "The 'pickString' type shows a selection list."))]
+                            enumDescriptions: [( localize(15815, "The 'pickString' type shows a selection list."))]
                         },
                         description: {
                             type: "string",
@@ -76,7 +76,7 @@ const inputsSchema = {
                         },
                         options: {
                             type: "array",
-                            description: ( localize(15520, "An array of strings that defines the options for a quick pick.")),
+                            description: ( localize(15816, "An array of strings that defines the options for a quick pick.")),
                             items: {
                                 oneOf: [{
                                     type: "string"
@@ -87,11 +87,11 @@ const inputsSchema = {
                                     properties: {
                                         label: {
                                             type: "string",
-                                            description: ( localize(15521, "Label for the option."))
+                                            description: ( localize(15817, "Label for the option."))
                                         },
                                         value: {
                                             type: "string",
-                                            description: ( localize(15522, "Value for the option."))
+                                            description: ( localize(15818, "Value for the option."))
                                         }
                                     }
                                 }]
@@ -111,22 +111,22 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["command"],
-                            enumDescriptions: [( localize(15523, "The 'command' type executes a command."))]
+                            enumDescriptions: [( localize(15819, "The 'command' type executes a command."))]
                         },
                         command: {
                             type: "string",
-                            description: ( localize(15524, "The command to execute for this input variable."))
+                            description: ( localize(15820, "The command to execute for this input variable."))
                         },
                         args: {
                             oneOf: [{
                                 type: "object",
-                                description: ( localize(15525, "Optional arguments passed to the command."))
+                                description: ( localize(15821, "Optional arguments passed to the command."))
                             }, {
                                 type: "array",
-                                description: ( localize(15525, "Optional arguments passed to the command."))
+                                description: ( localize(15821, "Optional arguments passed to the command."))
                             }, {
                                 type: "string",
-                                description: ( localize(15525, "Optional arguments passed to the command."))
+                                description: ( localize(15821, "Optional arguments passed to the command."))
                             }]
                         }
                     }

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 function applyDeprecatedVariableMessage(schema) {
     schema.pattern = schema.pattern || "^(?!.*\\$\\{(env|config|command)\\.)";
     schema.patternErrorMessage = schema.patternErrorMessage || ( localize(
-        15526,
+        15822,
         "'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead."
     ));
 }

package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js

@@ -85,7 +85,7 @@ class AbstractVariableResolverService {
                 return normalizeDriveLetter(filePath);
             }
             throw ( new VariableError(variableKind, ( localize(
-                15527,
+                15823,
                 "Variable {0} can not be resolved. Please open an editor.",
                 replacement.id
             ))));
@@ -99,7 +99,7 @@ class AbstractVariableResolverService {
                 }
             }
             throw ( new VariableError(variableKind, ( localize(
-                15528,
+                15824,
                 "Variable {0}: can not find workspace folder of '{1}'.",
                 replacement.id,
                 basename(filePath)
@@ -112,7 +112,7 @@ class AbstractVariableResolverService {
                     return folder;
                 }
                 throw ( new VariableError(variableKind, ( localize(
-                    15529,
+                    15825,
                     "Variable {0} can not be resolved. No such folder '{1}'.",
                     variableKind,
                     argument
@@ -123,13 +123,13 @@ class AbstractVariableResolverService {
             }
             if (this._context.getWorkspaceFolderCount() > 1) {
                 throw ( new VariableError(variableKind, ( localize(
-                    15530,
+                    15826,
                     "Variable {0} can not be resolved in a multi folder workspace. Scope this variable using ':' and a workspace folder name.",
                     variableKind
                 ))));
             }
             throw ( new VariableError(variableKind, ( localize(
-                15531,
+                15827,
                 "Variable {0} can not be resolved. Please open a folder.",
                 variableKind
             ))));
@@ -146,7 +146,7 @@ class AbstractVariableResolverService {
                 return "";
             }
             throw ( new VariableError(VariableKind.Env, ( localize(
-                15532,
+                15828,
                 "Variable {0} can not be resolved because no environment variable name is given.",
                 replacement.id
             ))));
@@ -155,7 +155,7 @@ class AbstractVariableResolverService {
                 const config = this._context.getConfigurationValue(folderUri, argument);
                 if (isUndefinedOrNull(config)) {
                     throw ( new VariableError(VariableKind.Config, ( localize(
-                        15533,
+                        15829,
                         "Variable {0} can not be resolved because setting '{1}' not found.",
                         replacement.id,
                         argument
@@ -163,7 +163,7 @@ class AbstractVariableResolverService {
                 }
                 if (isObject(config)) {
                     throw ( new VariableError(VariableKind.Config, ( localize(
-                        15534,
+                        15830,
                         "Variable {0} can not be resolved because '{1}' is a structured value.",
                         replacement.id,
                         argument
@@ -172,7 +172,7 @@ class AbstractVariableResolverService {
                 return config;
             }
             throw ( new VariableError(VariableKind.Config, ( localize(
-                15535,
+                15831,
                 "Variable {0} can not be resolved because no settings name is given.",
                 replacement.id
             ))));
@@ -191,7 +191,7 @@ class AbstractVariableResolverService {
                 const ext = await this._context.getExtension(argument);
                 if (!ext) {
                     throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                        15536,
+                        15832,
                         "Variable {0} can not be resolved because the extension {1} is not installed.",
                         replacement.id,
                         argument
@@ -200,7 +200,7 @@ class AbstractVariableResolverService {
                 return this.fsPath(ext.extensionLocation);
             }
             throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                15537,
+                15833,
                 "Variable {0} can not be resolved because no extension name is given.",
                 replacement.id
             ))));
@@ -232,7 +232,7 @@ class AbstractVariableResolverService {
                         return environment.userHome;
                     }
                     throw ( new VariableError(VariableKind.UserHome, ( localize(
-                        15538,
+                        15834,
                         "Variable {0} can not be resolved. UserHome path is not defined",
                         replacement.id
                     ))));
@@ -243,7 +243,7 @@ class AbstractVariableResolverService {
                             return lineNumber;
                         }
                         throw ( new VariableError(VariableKind.LineNumber, ( localize(
-                            15539,
+                            15835,
                             "Variable {0} can not be resolved. Make sure to have a line selected in the active editor.",
                             replacement.id
                         ))));
@@ -255,7 +255,7 @@ class AbstractVariableResolverService {
                             return columnNumber;
                         }
                         throw ( new Error(( localize(
-                            15540,
+                            15836,
                             "Variable {0} can not be resolved. Make sure to have a column selected in the active editor.",
                             replacement.id
                         ))));
@@ -267,7 +267,7 @@ class AbstractVariableResolverService {
                             return selectedText;
                         }
                         throw ( new VariableError(VariableKind.SelectedText, ( localize(
-                            15541,
+                            15837,
                             "Variable {0} can not be resolved. Make sure to have some text selected in the active editor.",
                             replacement.id
                         ))));
@@ -352,7 +352,7 @@ class AbstractVariableResolverService {
                 return v;
             }
             throw ( new VariableError(variableKind, ( localize(
-                15542,
+                15838,
                 "Variable {0} can not be resolved because the command has no value.",
                 match
             ))));

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

@@ -472,6 +472,12 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
                 };
             }
         }
+        if (options?.preserveFocus && this.editorGroupService.activeModalEditorPart?.groups.some(modalGroup => modalGroup.id === group.id) && this.editorGroupService.activeModalEditorPart.count === 1 && this.editorGroupService.activeModalEditorPart.groups[0].isEmpty) {
+            options = {
+                ...options,
+                preserveFocus: false
+            };
+        }
         return group.openEditor(typedEditor, options);
     }
     async openEditors(editors, preferredGroup, options) {
@@ -509,6 +515,15 @@ let EditorService = EditorService_1 = class EditorService extends Disposable {
                     ([group] = findGroupResult);
                 }
             }
+            if (typedEditor.options?.preserveFocus && this.editorGroupService.activeModalEditorPart?.groups.some(modalGroup => modalGroup.id === group.id) && this.editorGroupService.activeModalEditorPart.count === 1 && this.editorGroupService.activeModalEditorPart.groups[0].isEmpty) {
+                typedEditor = {
+                    ...typedEditor,
+                    options: {
+                        ...typedEditor.options,
+                        preserveFocus: false
+                    }
+                };
+            }
             let targetGroupEditors = mapGroupToTypedEditors.get(group);
             if (!targetGroupEditors) {
                 targetGroupEditors = [];

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

@@ -3,23 +3,21 @@ import { ServicesAccessor } from "../../../../platform/instantiation/common/inst
 import { EditorInputWithOptions, IUntypedEditorInput } from "../../../common/editor.js";
 import { IEditorGroup } from "./editorGroupsService.js";
 import { AUX_WINDOW_GROUP_TYPE, MODAL_GROUP_TYPE, PreferredGroup } from "./editorService.js";
-/**
- * Finds the target `IEditorGroup` given the instructions provided
- * that is best for the editor and matches the preferred group if
- * possible.
- */
-export declare function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [
+type FindGroupResult = Promise<[
     IEditorGroup,
     EditorActivation | undefined
-];
-export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [
-    IEditorGroup,
-    EditorActivation | undefined
-];
-export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): [
+]> | [
     IEditorGroup,
     EditorActivation | undefined
 ];
+/**
+ * Finds the target `IEditorGroup` given the instructions provided
+ * that is best for the editor and matches the preferred group if
+ * possible.
+ */
+export declare function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
+export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
+export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: Exclude<PreferredGroup, AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE> | undefined): FindGroupResult;
 export declare function findGroup(accessor: ServicesAccessor, editor: IUntypedEditorInput, preferredGroup: AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE): Promise<[
     IEditorGroup,
     EditorActivation | undefined
@@ -32,10 +30,5 @@ export declare function findGroup(accessor: ServicesAccessor, editor: EditorInpu
     IEditorGroup,
     EditorActivation | undefined
 ]>;
-export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): Promise<[
-    IEditorGroup,
-    EditorActivation | undefined
-]> | [
-    IEditorGroup,
-    EditorActivation | undefined
-];
+export declare function findGroup(accessor: ServicesAccessor, editor: EditorInputWithOptions | IUntypedEditorInput, preferredGroup: PreferredGroup | undefined): FindGroupResult;
+export {};

package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js

@@ -2,6 +2,7 @@
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import { isEditorInputWithOptions, isEditorInput, EditorInputCapabilities } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 import { preferredSideBySideGroupDirection, GroupsOrder } from './editorGroupsService.js';
 import { IEditorGroupsService } from './editorGroupsService.service.js';
 import { MODAL_GROUP, SIDE_GROUP, AUX_WINDOW_GROUP } from './editorService.js';
@@ -20,20 +21,22 @@ function findGroup(accessor, editor, preferredGroup) {
 function handleGroupResult(group, editor, preferredGroup, editorGroupService, configurationService) {
     const modalEditorPart = editorGroupService.activeModalEditorPart;
     const modalEditorMode = configurationService.getValue("workbench.editor.useModal");
-    if (modalEditorPart && preferredGroup !== MODAL_GROUP && modalEditorMode !== "all") {
-        group = handleModalEditorPart(group, editor, modalEditorPart, editorGroupService);
+    const editorInput = isEditorInputWithOptions(editor) ? editor.editor : isEditorInput(editor) ? editor : undefined;
+    const requiresModal = editorInput instanceof EditorInput && editorInput.hasCapability(EditorInputCapabilities.RequiresModal);
+    if (modalEditorPart && preferredGroup !== MODAL_GROUP && modalEditorMode !== "all" && !requiresModal) {
+        return handleModalEditorPart(group, editor, modalEditorPart, editorGroupService, preferredGroup);
     }
     return handleGroupActivation(group, editor, preferredGroup, editorGroupService);
 }
-function handleModalEditorPart(group, editor, modalEditorPart, editorGroupService) {
+async function handleModalEditorPart(group, editor, modalEditorPart, editorGroupService, preferredGroup) {
     const options = editor.options;
     if (( modalEditorPart.groups.some(modalGroup => modalGroup.id === group.id))) {
         group = editorGroupService.mainPart.activeGroup;
     }
     if (!options?.preserveFocus) {
-        modalEditorPart.close();
+        await modalEditorPart.close();
     }
-    return group;
+    return handleGroupActivation(group, editor, preferredGroup, editorGroupService);
 }
 function handleGroupActivation(group, editor, preferredGroup, editorGroupService) {
     let activation = undefined;
@@ -47,7 +50,10 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
     let group;
     const editor = isEditorInputWithOptions(input) ? input.editor : input;
     const options = input.options;
-    if (preferredGroup && typeof preferredGroup !== "number") {
+    if (isEditorInput(editor) && editor.hasCapability(EditorInputCapabilities.RequiresModal)) {
+        group = editorGroupService.createModalEditorPart(options?.modal).then(part => part.activeGroup);
+    }
+    else if (preferredGroup && typeof preferredGroup !== "number") {
         group = preferredGroup;
     }
     else if (typeof preferredGroup === "number" && preferredGroup >= 0) {