@codingame/monaco-vscode-api 30.0.1 → 31.0.1

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(
-            15822,
+            16039,
             "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(15823, "Unable to open a new window."))));
+            throw ( new Error(( localize(16040, "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(
-                    15824,
+                    16041,
                     "The browser blocked opening a new window. Press 'Retry' to try again."
                 )),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            15825,
+                            16042,
                             "Please allow pop-ups for this website in your [browser settings]({0}).",
                             "https://aka.ms/allow-vscode-popup"
                         )), true))
                     }]
                 },
                 buttons: [{
-                    label: ( localize(15826, "&&Retry")),
+                    label: ( localize(16043, "&&Retry")),
                     run: () => this.openWindow(options)
                 }],
                 cancelButton: true

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.d.ts

@@ -25,9 +25,11 @@ export declare namespace ChatEntitlementContextKeys {
         hidden: RawContextKey<boolean>;
         installed: RawContextKey<boolean>;
         disabled: RawContextKey<boolean>;
+        disabledInWorkspace: RawContextKey<boolean>;
         untrusted: RawContextKey<boolean>;
         later: RawContextKey<boolean>;
         registered: RawContextKey<boolean>;
+        completed: RawContextKey<boolean>;
     };
     const Entitlement: {
         signedOut: RawContextKey<boolean>;
@@ -69,6 +71,10 @@ export declare enum ChatEntitlement {
     Enterprise = 9
 }
 export interface IChatSentiment {
+    /**
+     * Whether the user has completed the setup flow or not, regardless of the outcome
+     */
+    completed?: boolean;
     /**
      * User has Chat installed.
      */
@@ -87,6 +93,14 @@ export interface IChatSentiment {
      * Chat but but disable its functionality.
      */
     disabled?: boolean;
+    /**
+     * Chat is disabled at the workspace level
+     *
+     * Note: in contrast to `hidden` (which hides all UI globally),
+     * this only disables Chat in the current workspace while
+     * keeping its UI visible so the user can re-enable it.
+     */
+    disabledInWorkspace?: boolean;
     /**
      * Chat is disabled due to missing workspace trust.
      *
@@ -136,6 +150,7 @@ export declare class ChatEntitlementService extends Disposable implements IChatE
     get sku(): string | undefined;
     get copilotTrackingId(): string | undefined;
     get previewFeaturesDisabled(): boolean;
+    get clientByokEnabled(): boolean;
     private readonly _onDidChangeQuotaExceeded;
     readonly onDidChangeQuotaExceeded: Event<void>;
     private readonly _onDidChangeQuotaRemaining;
@@ -238,10 +253,6 @@ export interface IChatEntitlementContextState extends IChatSentiment {
      * User's Copilot tracking ID from the entitlement API.
      */
     copilotTrackingId: string | undefined;
-    /**
-     * User is or was a registered Chat user.
-     */
-    registered?: boolean;
 }
 export declare class ChatEntitlementContext extends Disposable {
     private readonly storageService;
@@ -249,6 +260,7 @@ export declare class ChatEntitlementContext extends Disposable {
     private readonly configurationService;
     private readonly telemetryService;
     private static readonly CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY;
+    private static readonly CHAT_ENTITLEMENT_CONTEXT_MIGRATED_STORAGE_KEY;
     private static readonly CHAT_DISABLED_CONFIGURATION_KEY;
     private readonly canSignUpContextKey;
     private readonly signedOutContextKey;
@@ -261,7 +273,9 @@ export declare class ChatEntitlementContext extends Disposable {
     private readonly organisationsContextKey;
     private readonly isInternalContextKey;
     private readonly skuContextKey;
+    private readonly completedContext;
     private readonly hiddenContext;
+    private readonly disabledInWorkspaceContext;
     private readonly laterContext;
     private readonly installedContext;
     private readonly disabledContext;
@@ -280,6 +294,10 @@ export declare class ChatEntitlementContext extends Disposable {
         installed: boolean;
         disabled: boolean;
         untrusted: boolean;
+        disabledInWorkspace: boolean;
+    }): Promise<void>;
+    update(context: {
+        completed: true;
     }): Promise<void>;
     update(context: {
         hidden: false;

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

@@ -38,9 +38,11 @@ var ChatEntitlementContextKeys;
         hidden: ( new RawContextKey("chatSetupHidden", false, true)),
         installed: ( new RawContextKey("chatSetupInstalled", false, true)),
         disabled: ( new RawContextKey("chatSetupDisabled", false, true)),
+        disabledInWorkspace: ( new RawContextKey("chatSetupDisabledInWorkspace", false, true)),
         untrusted: ( new RawContextKey("chatSetupUntrusted", false, true)),
         later: ( new RawContextKey("chatSetupLater", false, true)),
-        registered: ( new RawContextKey("chatSetupRegistered", false, true))
+        registered: ( new RawContextKey("chatSetupRegistered", false, true)),
+        completed: ( new RawContextKey("chatSetupCompleted", false, true))
     };
     ChatEntitlementContextKeys.Entitlement = {
         signedOut: ( new RawContextKey("chatEntitlementSignedOut", false, true)),
@@ -78,17 +80,17 @@ function isProUser(chatEntitlement) {
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.EDU:
-        return localize(15827, "Copilot EDU");
+        return localize(16044, "Copilot EDU");
     case ChatEntitlement.Pro:
-        return localize(15828, "Copilot Pro");
+        return localize(16045, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(15829, "Copilot Pro+");
+        return localize(16046, "Copilot Pro+");
     case ChatEntitlement.Business:
-        return localize(15830, "Copilot Business");
+        return localize(16047, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(15831, "Copilot Enterprise");
+        return localize(16048, "Copilot Enterprise");
     default:
-        return localize(15832, "Copilot Free");
+        return localize(16049, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -105,7 +107,7 @@ function isAnonymous(configurationService, entitlement, sentiment) {
     if (entitlement !== ChatEntitlement.Unknown) {
         return false;
     }
-    if (sentiment.hidden || sentiment.disabled) {
+    if (sentiment.hidden || sentiment.disabledInWorkspace) {
         return false;
     }
     return true;
@@ -169,6 +171,7 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
         this.onDidChangeSentiment = ( Event.map(Event.filter(
             this.contextKeyService.onDidChangeContext,
             e => e.affectsSome(( new Set([
+                ChatEntitlementContextKeys.Setup.completed.key,
                 ChatEntitlementContextKeys.Setup.hidden.key,
                 ChatEntitlementContextKeys.Setup.disabled.key,
                 ChatEntitlementContextKeys.Setup.untrusted.key,
@@ -228,6 +231,9 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
     get previewFeaturesDisabled() {
         return this.contextKeyService.getContextKeyValue("github.copilot.previewFeaturesDisabled") === true;
     }
+    get clientByokEnabled() {
+        return this.contextKeyService.getContextKeyValue("github.copilot.clientByokEnabled") === true;
+    }
     get quotas() {
         return this._quotas;
     }
@@ -303,8 +309,10 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
     }
     get sentiment() {
         return {
+            completed: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.completed.key) === true,
             installed: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.installed.key) === true,
             hidden: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.hidden.key) === true,
+            disabledInWorkspace: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.disabledInWorkspace.key) === true,
             disabled: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.disabled.key) === true,
             untrusted: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.untrusted.key) === true,
             later: this.contextKeyService.getContextKeyValue(ChatEntitlementContextKeys.Setup.later.key) === true,
@@ -360,7 +368,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
     registerListeners() {
         this._register(this.defaultAccountService.onDidChangeDefaultAccount(() => this.resolve()));
         this._register(this.context.onDidChange(() => {
-            if (!this.context.state.installed || this.context.state.disabled || this.context.state.entitlement === ChatEntitlement.Unknown) {
+            if (this.context.state.disabled || this.context.state.entitlement === ChatEntitlement.Unknown) {
                 this.state = {
                     entitlement: this.state.entitlement,
                     quotas: undefined
@@ -556,7 +564,9 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
         }
     }
     async forceResolveEntitlement(token = CancellationToken.None) {
-        const defaultAccount = await this.defaultAccountService.refresh();
+        const defaultAccount = await this.defaultAccountService.refresh({
+            forceRefresh: true
+        });
         if (!defaultAccount) {
             return undefined;
         }
@@ -583,7 +593,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(15833, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(16050, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -606,7 +616,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(15834, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(16051, "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
             };
@@ -616,7 +626,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(15835, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(16052, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -626,7 +636,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(15836, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(16053, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -657,11 +667,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    15837,
+                    16054,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(15838, "Retry"))
+                primaryButton: ( localize(16055, "Retry"))
             });
             return confirmed;
         }
@@ -673,15 +683,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    15839,
+                    16056,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(15840, "OK")),
+                    label: ( localize(16057, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(15841, "Learn More")),
+                    label: ( localize(16058, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });
@@ -717,6 +727,9 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
     static {
         this.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY = "chat.setupContext";
     }
+    static {
+        this.CHAT_ENTITLEMENT_CONTEXT_MIGRATED_STORAGE_KEY = "chat.setupContext.migrated.v1";
+    }
     static {
         this.CHAT_DISABLED_CONFIGURATION_KEY = "chat.disableAIFeatures";
     }
@@ -750,7 +763,9 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         this.organisationsContextKey = ChatEntitlementContextKeys.Entitlement.organisations.bindTo(contextKeyService);
         this.isInternalContextKey = ChatEntitlementContextKeys.Entitlement.internal.bindTo(contextKeyService);
         this.skuContextKey = ChatEntitlementContextKeys.Entitlement.sku.bindTo(contextKeyService);
+        this.completedContext = ChatEntitlementContextKeys.Setup.completed.bindTo(contextKeyService);
         this.hiddenContext = ChatEntitlementContextKeys.Setup.hidden.bindTo(contextKeyService);
+        this.disabledInWorkspaceContext = ChatEntitlementContextKeys.Setup.disabledInWorkspace.bindTo(contextKeyService);
         this.laterContext = ChatEntitlementContextKeys.Setup.later.bindTo(contextKeyService);
         this.installedContext = ChatEntitlementContextKeys.Setup.installed.bindTo(contextKeyService);
         this.disabledContext = ChatEntitlementContextKeys.Setup.disabled.bindTo(contextKeyService);
@@ -765,6 +780,27 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
             sku: undefined,
             copilotTrackingId: undefined
         };
+        const migrated = this.storageService.getBoolean(
+            ChatEntitlementContext_1.CHAT_ENTITLEMENT_CONTEXT_MIGRATED_STORAGE_KEY,
+            StorageScope.PROFILE
+        ) === true;
+        if (!migrated) {
+            this.storageService.store(
+                ChatEntitlementContext_1.CHAT_ENTITLEMENT_CONTEXT_MIGRATED_STORAGE_KEY,
+                true,
+                StorageScope.PROFILE,
+                StorageTarget.MACHINE
+            );
+            if (this._state.installed && !this._state.completed) {
+                this._state.completed = true;
+                this.storageService.store(
+                    ChatEntitlementContext_1.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY,
+                    this._state,
+                    StorageScope.PROFILE,
+                    StorageTarget.MACHINE
+                );
+            }
+        }
         this.updateContextSync();
         this.registerListeners();
     }
@@ -791,6 +827,7 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
             this._state.installed = context.installed;
             this._state.disabled = context.disabled;
             this._state.untrusted = context.untrusted;
+            this._state.disabledInWorkspace = context.disabledInWorkspace;
             if (context.installed && !context.disabled) {
                 context.hidden = false;
             }
@@ -801,6 +838,9 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
         if (typeof context.later === "boolean") {
             this._state.later = context.later;
         }
+        if (typeof context.completed === "boolean") {
+            this._state.completed = context.completed;
+        }
         if (typeof context.entitlement === "number") {
             this._state.entitlement = context.entitlement;
             this._state.organisations = context.organisations;
@@ -843,7 +883,9 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
             org => org === "github" || org === "microsoft" || org === "ms-copilot" || org === "MicrosoftCopilot"
         )));
         this.skuContextKey.set(state.sku);
+        this.completedContext.set(!!state.completed);
         this.hiddenContext.set(!!state.hidden);
+        this.disabledInWorkspaceContext.set(!!state.disabledInWorkspace);
         this.laterContext.set(!!state.later);
         this.installedContext.set(!!state.installed);
         this.disabledContext.set(!!state.disabled);

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.service.d.ts

@@ -9,6 +9,7 @@ export interface IChatEntitlementService {
     readonly entitlement: ChatEntitlement;
     readonly entitlementObs: IObservable<ChatEntitlement>;
     readonly previewFeaturesDisabled: boolean;
+    readonly clientByokEnabled: boolean;
     readonly organisations: string[] | undefined;
     readonly isInternal: boolean;
     readonly sku: string | undefined;

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

@@ -2,18 +2,18 @@
 import { localize } from '../../../../nls.js';
 
 const idDescription = ( localize(
-    15894,
+    16111,
     "The input's id is used to associate an input with a variable of the form ${input:id}."
 ));
-const typeDescription = ( localize(15895, "The type of user input prompt to use."));
-const descriptionDescription = ( localize(15896, "The description is shown when the user is prompted for input."));
-const defaultDescription = ( localize(15897, "The default value for the input."));
+const typeDescription = ( localize(16112, "The type of user input prompt to use."));
+const descriptionDescription = ( localize(16113, "The description is shown when the user is prompted for input."));
+const defaultDescription = ( localize(16114, "The default value for the input."));
 const inputsSchema = {
     definitions: {
         inputs: {
             type: "array",
             description: ( localize(
-                15898,
+                16115,
                 "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(
-                                15899,
+                                16116,
                                 "The 'promptString' type opens an input box to ask the user for input."
                             ))]
                         },
@@ -46,7 +46,7 @@ const inputsSchema = {
                         password: {
                             type: "boolean",
                             description: ( localize(
-                                15900,
+                                16117,
                                 "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(15901, "The 'pickString' type shows a selection list."))]
+                            enumDescriptions: [( localize(16118, "The 'pickString' type shows a selection list."))]
                         },
                         description: {
                             type: "string",
@@ -76,7 +76,7 @@ const inputsSchema = {
                         },
                         options: {
                             type: "array",
-                            description: ( localize(15902, "An array of strings that defines the options for a quick pick.")),
+                            description: ( localize(16119, "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(15903, "Label for the option."))
+                                            description: ( localize(16120, "Label for the option."))
                                         },
                                         value: {
                                             type: "string",
-                                            description: ( localize(15904, "Value for the option."))
+                                            description: ( localize(16121, "Value for the option."))
                                         }
                                     }
                                 }]
@@ -111,22 +111,22 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["command"],
-                            enumDescriptions: [( localize(15905, "The 'command' type executes a command."))]
+                            enumDescriptions: [( localize(16122, "The 'command' type executes a command."))]
                         },
                         command: {
                             type: "string",
-                            description: ( localize(15906, "The command to execute for this input variable."))
+                            description: ( localize(16123, "The command to execute for this input variable."))
                         },
                         args: {
                             oneOf: [{
                                 type: "object",
-                                description: ( localize(15907, "Optional arguments passed to the command."))
+                                description: ( localize(16124, "Optional arguments passed to the command."))
                             }, {
                                 type: "array",
-                                description: ( localize(15907, "Optional arguments passed to the command."))
+                                description: ( localize(16124, "Optional arguments passed to the command."))
                             }, {
                                 type: "string",
-                                description: ( localize(15907, "Optional arguments passed to the command."))
+                                description: ( localize(16124, "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(
-        15908,
+        16125,
         "'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(
-                15909,
+                16126,
                 "Variable {0} can not be resolved. Please open an editor.",
                 replacement.id
             ))));
@@ -99,7 +99,7 @@ class AbstractVariableResolverService {
                 }
             }
             throw ( new VariableError(variableKind, ( localize(
-                15910,
+                16127,
                 "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(
-                    15911,
+                    16128,
                     "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(
-                    15912,
+                    16129,
                     "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(
-                15913,
+                16130,
                 "Variable {0} can not be resolved. Please open a folder.",
                 variableKind
             ))));
@@ -146,7 +146,7 @@ class AbstractVariableResolverService {
                 return "";
             }
             throw ( new VariableError(VariableKind.Env, ( localize(
-                15914,
+                16131,
                 "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(
-                        15915,
+                        16132,
                         "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(
-                        15916,
+                        16133,
                         "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(
-                15917,
+                16134,
                 "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(
-                        15918,
+                        16135,
                         "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(
-                15919,
+                16136,
                 "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(
-                        15920,
+                        16137,
                         "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(
-                            15921,
+                            16138,
                             "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(
-                            15922,
+                            16139,
                             "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(
-                            15923,
+                            16140,
                             "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(
-                15924,
+                16141,
                 "Variable {0} can not be resolved because the command has no value.",
                 match
             ))));

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

@@ -457,6 +457,22 @@ export interface IModalEditorPart extends IEditorPart {
         left: number;
         top: number;
     } | undefined;
+    /**
+     * Whether the modal editor part has a sidebar.
+     */
+    readonly hasSidebar: boolean;
+    /**
+     * Sidebar width set by the user via resizing, if any.
+     */
+    readonly sidebarWidth: number | undefined;
+    /**
+     * Whether the sidebar is hidden.
+     */
+    readonly sidebarHidden: boolean;
+    /**
+     * Toggle sidebar visibility.
+     */
+    toggleSidebar(): void;
     /**
      * The current navigation context, if any.
      */

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

@@ -16,7 +16,7 @@ const editorAssociationsConfigurationNode = {
         "workbench.editorAssociations": {
             type: "object",
             markdownDescription: ( localize(
-                15978,
+                16195,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
             )),
             additionalProperties: {