@codingame/monaco-vscode-api 17.2.1 → 18.0.0

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js

@@ -46,9 +46,9 @@ var TestRunProfileBitset;
     TestRunProfileBitset[TestRunProfileBitset["SupportsContinuousRun"] = 64] = "SupportsContinuousRun";
 })(TestRunProfileBitset || (TestRunProfileBitset = {}));
 const testProfileBitset = {
-    [TestRunProfileBitset.Run]: ( localize(11059, 'Run')),
-    [TestRunProfileBitset.Debug]: ( localize(11060, 'Debug')),
-    [TestRunProfileBitset.Coverage]: ( localize(11061, 'Coverage')),
+    [TestRunProfileBitset.Run]: ( localize(11325, 'Run')),
+    [TestRunProfileBitset.Debug]: ( localize(11326, 'Debug')),
+    [TestRunProfileBitset.Coverage]: ( localize(11327, 'Coverage')),
 };
 const testRunProfileBitsetList = [
     TestRunProfileBitset.Run,

package/vscode/src/vs/workbench/contrib/webview/browser/webview.service.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { IWebview, WebviewInitInfo, IWebviewElement, IOverlayWebview } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview, WebviewInitInfo, IWebviewElement, IOverlayWebview } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/webview/browser/webview";
 export declare const IWebviewService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWebviewService>;
 export interface IWebviewService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service.d.ts

@@ -4,8 +4,8 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { GroupIdentifier } from "../../../common/editor.js";
 import { IEditorGroup } from "../../../services/editor/common/editorGroupsService.js";
 import { ACTIVE_GROUP_TYPE, SIDE_GROUP_TYPE } from "../../../services/editor/common/editorService.js";
-import { WebviewInitInfo } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webview/browser/webview";
-import { WebviewInput } from "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
+import { WebviewInitInfo } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { WebviewInput } from "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput";
 import { WebviewIconManager, WebviewIcons } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewIconManager";
 import { IWebViewShowOptions, WebviewResolver } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService";
 export declare const IWebviewWorkbenchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWebviewWorkbenchService>;

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service.d.ts

@@ -0,0 +1,6 @@
+import { IGettingStartedExperiment } from "@codingame/monaco-vscode-welcome-service-override/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService";
+export declare const IGettingStartedExperimentService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IGettingStartedExperimentService>;
+export interface IGettingStartedExperimentService {
+    readonly _serviceBrand: undefined;
+    getCurrentExperiment(): IGettingStartedExperiment | undefined;
+}

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IGettingStartedExperimentService = ( createDecorator('gettingStartedExperimentService'));
+
+export { IGettingStartedExperimentService };

package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.js

@@ -88,7 +88,7 @@ class NullDefaultAccountService extends Disposable {
         return result.get(key);
     }
     async getDefaultAccountFromAuthenticatedSessions(authProviderId, enterpriseAuthProviderId, enterpriseAuthProviderConfig, scopes, tokenEntitlementUrl, chatEntitlementUrl) {
-        const id = this.configurationService.getValue(enterpriseAuthProviderConfig) ? enterpriseAuthProviderId : authProviderId;
+        const id = this.configurationService.getValue(enterpriseAuthProviderConfig) === enterpriseAuthProviderId ? enterpriseAuthProviderId : authProviderId;
         const sessions = await this.authenticationService.getSessions(id, undefined, undefined, true);
         const session = sessions.find(s => this.scopesMatch(s.scopes, scopes));
         if (!session) {
@@ -164,7 +164,7 @@ class NullDefaultAccountService extends Disposable {
             constructor() {
                 super({
                     id: 'workbench.accounts.actions.signin',
-                    title: ( localize(11913, "Sign in to {0}", authProviderLabel)),
+                    title: ( localize(12181, "Sign in to {0}", authProviderLabel)),
                     menu: {
                         id: MenuId.AccountsContext,
                         when: ( ContextKeyExpr.and(( CONTEXT_DEFAULT_ACCOUNT_STATE.isEqualTo(DefaultAccountStatus.Unavailable)), ( ContextKeyExpr.has('config.extensions.gallery.serviceUrl')))),
@@ -173,7 +173,7 @@ class NullDefaultAccountService extends Disposable {
                 });
             }
             run() {
-                const id = that.configurationService.getValue(enterpriseAuthProviderConfig) ? enterpriseAuthProviderId : authProviderId;
+                const id = that.configurationService.getValue(enterpriseAuthProviderConfig) === enterpriseAuthProviderId ? enterpriseAuthProviderId : authProviderId;
                 return that.authenticationService.createSession(id, scopes);
             }
         }));

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ViewContainer } from "../../../common/views.js";
-import { IActivity } from "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity";
+import { IActivity } from "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity";
 export declare const IActivityService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IActivityService>;
 export interface IActivityService {
     readonly _serviceBrand: undefined;

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

@@ -11,6 +11,7 @@ export interface AiSettingsSearchResult {
 }
 export interface AiSettingsSearchProviderOptions {
     limit: number;
+    embeddingsOnly: boolean;
 }
 export interface IAiSettingsSearchProvider {
     searchSettings(query: string, option: AiSettingsSearchProviderOptions, token: CancellationToken): void;

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

@@ -1,11 +1,13 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IAiSettingsSearchProvider, AiSettingsSearchResult } from "./aiSettingsSearch.js";
 export declare const IAiSettingsSearchService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAiSettingsSearchService>;
 export interface IAiSettingsSearchService {
     readonly _serviceBrand: undefined;
+    readonly onProviderRegistered: Event<void>;
     isEnabled(): boolean;
-    startSearch(query: string, token: CancellationToken): void;
+    startSearch(query: string, embeddingsOnly: boolean, token: CancellationToken): void;
     getEmbeddingsResults(query: string, token: CancellationToken): Promise<string[] | null>;
     getLLMRankedResults(query: string, token: CancellationToken): Promise<string[] | null>;
     registerSettingsSearchProvider(provider: IAiSettingsSearchProvider): IDisposable;

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service.d.ts

@@ -0,0 +1,14 @@
+import { Event } from "../../../../base/common/event.js";
+import { AllowedMcpServer } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/authentication/browser/authenticationMcpAccessService";
+export declare const IAuthenticationMcpAccessService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationMcpAccessService>;
+export interface IAuthenticationMcpAccessService {
+    readonly _serviceBrand: undefined;
+    readonly onDidChangeMcpSessionAccess: Event<{
+        providerId: string;
+        accountName: string;
+    }>;
+    isAccessAllowed(providerId: string, accountName: string, mcpServerId: string): boolean | undefined;
+    readAllowedMcpServers(providerId: string, accountName: string): AllowedMcpServer[];
+    updateAllowedMcpServers(providerId: string, accountName: string, mcpServers: AllowedMcpServer[]): void;
+    removeAllowedMcpServers(providerId: string, accountName: string): void;
+}

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpAccessService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IAuthenticationMcpAccessService = ( createDecorator('IAuthenticationMcpAccessService'));
+
+export { IAuthenticationMcpAccessService };

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpService.service.d.ts

@@ -0,0 +1,19 @@
+import { Event } from "../../../../base/common/event.js";
+import { AuthenticationSessionAccount, AuthenticationSession } from "../common/authentication.js";
+export declare const IAuthenticationMcpService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationMcpService>;
+export interface IAuthenticationMcpService {
+    readonly _serviceBrand: undefined;
+    onDidChangeAccountPreference: Event<{
+        mcpServerIds: string[];
+        providerId: string;
+    }>;
+    getAccountPreference(mcpServerId: string, providerId: string): string | undefined;
+    updateAccountPreference(mcpServerId: string, providerId: string, account: AuthenticationSessionAccount): void;
+    removeAccountPreference(mcpServerId: string, providerId: string): void;
+    updateSessionPreference(providerId: string, mcpServerId: string, session: AuthenticationSession): void;
+    getSessionPreference(providerId: string, mcpServerId: string, scopes: string[]): string | undefined;
+    removeSessionPreference(providerId: string, mcpServerId: string, scopes: string[]): void;
+    selectSession(providerId: string, mcpServerId: string, mcpServerName: string, scopes: string[], possibleSessions: readonly AuthenticationSession[]): Promise<AuthenticationSession>;
+    requestSessionAccess(providerId: string, mcpServerId: string, mcpServerName: string, scopes: string[], possibleSessions: readonly AuthenticationSession[]): void;
+    requestNewSession(providerId: string, scopes: string[], mcpServerId: string, mcpServerName: string): Promise<void>;
+}

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IAuthenticationMcpService = ( createDecorator('IAuthenticationMcpService'));
+
+export { IAuthenticationMcpService };

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service.d.ts

@@ -0,0 +1,10 @@
+import { IAuthenticationMcpUsage } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService";
+export declare const IAuthenticationMcpUsageService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationMcpUsageService>;
+export interface IAuthenticationMcpUsageService {
+    readonly _serviceBrand: undefined;
+    initializeUsageCache(): Promise<void>;
+    hasUsedAuth(mcpServerId: string): Promise<boolean>;
+    readAccountUsages(providerId: string, accountName: string): IAuthenticationMcpUsage[];
+    removeAccountUsage(providerId: string, accountName: string): void;
+    addAccountUsage(providerId: string, accountName: string, scopes: ReadonlyArray<string>, mcpServerId: string, mcpServerName: string): void;
+}

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IAuthenticationMcpUsageService = ( createDecorator('IAuthenticationMcpUsageService'));
+
+export { IAuthenticationMcpUsageService };

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

@@ -1,4 +1,6 @@
 import { Event } from "../../../../base/common/event.js";
+import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "../../../../base/common/oauth.js";
+import { URI } from "../../../../base/common/uri.js";
 export declare const INTERNAL_AUTH_PROVIDER_PREFIX = "__";
 export interface AuthenticationSessionAccount {
     label: string;
@@ -19,10 +21,16 @@ export interface AuthenticationSessionsChangeEvent {
 export interface AuthenticationProviderInformation {
     id: string;
     label: string;
+    authorizationServerGlobs?: ReadonlyArray<string>;
 }
 export interface IAuthenticationCreateSessionOptions {
     activateImmediate?: boolean;
     account?: AuthenticationSessionAccount;
+    authorizationServer?: URI;
+}
+export interface IAuthenticationGetSessionsOptions {
+    account?: AuthenticationSessionAccount;
+    authorizationServer?: URI;
 }
 export interface AllowedExtension {
     id: string;
@@ -31,12 +39,19 @@ export interface AllowedExtension {
     lastUsed?: number;
     trusted?: boolean;
 }
+export interface IAuthenticationProviderHostDelegate {
+    readonly priority: number;
+    create(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resource: IAuthorizationProtectedResourceMetadata | undefined): Promise<string>;
+}
+export declare function isAuthenticationSession(thing: unknown): thing is AuthenticationSession;
 export interface IAuthenticationProviderSessionOptions {
     account?: AuthenticationSessionAccount;
+    authorizationServer?: URI;
 }
 export interface IAuthenticationProvider {
     readonly id: string;
     readonly label: string;
+    readonly authorizationServers?: ReadonlyArray<URI>;
     readonly supportsMultipleAccounts: boolean;
     readonly onDidChangeSessions: Event<AuthenticationSessionsChangeEvent>;
     getSessions(scopes: string[] | undefined, options: IAuthenticationProviderSessionOptions): Promise<readonly AuthenticationSession[]>;

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

@@ -1,5 +1,8 @@
 import { Event } from "../../../../base/common/event.js";
-import { AuthenticationProviderInformation, AuthenticationSessionsChangeEvent, IAuthenticationProvider, AuthenticationSessionAccount, AuthenticationSession, IAuthenticationCreateSessionOptions } from "./authentication.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IAuthorizationServerMetadata, IAuthorizationProtectedResourceMetadata } from "../../../../base/common/oauth.js";
+import { URI } from "../../../../base/common/uri.js";
+import { AuthenticationProviderInformation, AuthenticationSessionsChangeEvent, IAuthenticationProvider, AuthenticationSessionAccount, IAuthenticationGetSessionsOptions, AuthenticationSession, IAuthenticationCreateSessionOptions, IAuthenticationProviderHostDelegate } from "./authentication.js";
 export declare const IAuthenticationService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationService>;
 export interface IAuthenticationService {
     readonly _serviceBrand: undefined;
@@ -20,9 +23,12 @@ export interface IAuthenticationService {
     getProviderIds(): string[];
     getProvider(id: string): IAuthenticationProvider;
     getAccounts(id: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
-    getSessions(id: string, scopes?: string[], account?: AuthenticationSessionAccount, activateImmediate?: boolean): Promise<ReadonlyArray<AuthenticationSession>>;
+    getSessions(id: string, scopes?: string[], options?: IAuthenticationGetSessionsOptions, activateImmediate?: boolean): Promise<ReadonlyArray<AuthenticationSession>>;
     createSession(providerId: string, scopes: string[], options?: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
     removeSession(providerId: string, sessionId: string): Promise<void>;
+    getOrActivateProviderIdForServer(authorizationServer: URI): Promise<string | undefined>;
+    registerAuthenticationProviderHostDelegate(delegate: IAuthenticationProviderHostDelegate): IDisposable;
+    createDynamicAuthenticationProvider(authorizationServer: URI, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined): Promise<IAuthenticationProvider | undefined>;
 }
 export declare const IAuthenticationExtensionsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAuthenticationExtensionsService>;
 export interface IAuthenticationExtensionsService {

package/vscode/src/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.d.ts

@@ -0,0 +1,15 @@
+import { IAuthorizationTokenResponse } from "../../../../base/common/oauth.js";
+export interface DynamicAuthenticationProviderInfo {
+    readonly providerId: string;
+    readonly label: string;
+    readonly issuer?: string;
+    readonly authorizationServer: string;
+    readonly clientId: string;
+}
+export interface DynamicAuthenticationProviderTokensChangeEvent {
+    readonly authProviderId: string;
+    readonly clientId: string;
+    readonly tokens: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[] | undefined;
+}

package/vscode/src/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service.d.ts

@@ -0,0 +1,18 @@
+import { Event } from "../../../../base/common/event.js";
+import { IAuthorizationTokenResponse } from "../../../../base/common/oauth.js";
+import { DynamicAuthenticationProviderTokensChangeEvent, DynamicAuthenticationProviderInfo } from "./dynamicAuthenticationProviderStorage.js";
+export declare const IDynamicAuthenticationProviderStorageService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IDynamicAuthenticationProviderStorageService>;
+export interface IDynamicAuthenticationProviderStorageService {
+    readonly _serviceBrand: undefined;
+    readonly onDidChangeTokens: Event<DynamicAuthenticationProviderTokensChangeEvent>;
+    getClientId(providerId: string): string | undefined;
+    storeClientId(providerId: string, authorizationServer: string, clientId: string, label?: string): void;
+    getInteractedProviders(): ReadonlyArray<DynamicAuthenticationProviderInfo>;
+    removeDynamicProvider(providerId: string): Promise<void>;
+    getSessionsForDynamicAuthProvider(authProviderId: string, clientId: string): Promise<(IAuthorizationTokenResponse & {
+        created_at: number;
+    })[] | undefined>;
+    setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[]): Promise<void>;
+}

package/vscode/src/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IDynamicAuthenticationProviderStorageService = ( createDecorator('dynamicAuthenticationProviderStorageService'));
+
+export { IDynamicAuthenticationProviderStorageService };

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

@@ -0,0 +1,9 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { BrowserType, IElementData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/platform/browserElements/common/browserElements";
+import { IRectangle } from "../../../../platform/window/common/window.js";
+export declare const IBrowserElementsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IBrowserElementsService>;
+export interface IBrowserElementsService {
+    _serviceBrand: undefined;
+    getElementData(rect: IRectangle, token: CancellationToken, browserType: BrowserType | undefined): Promise<IElementData | undefined>;
+    startDebugSession(token: CancellationToken, browserType: BrowserType): Promise<void>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IBrowserElementsService = ( createDecorator('browserElementsService'));
+
+export { IBrowserElementsService };

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverExpression.d.ts

@@ -20,7 +20,7 @@ export interface IResolvedValue {
 }
 export declare class ConfigurationResolverExpression<T> implements IConfigurationResolverExpression<T> {
     static readonly VARIABLE_LHS = "${";
-    private locations;
+    private readonly locations;
     private root;
     private stringRoot;
     private newReplacementNotifiers;
@@ -37,6 +37,7 @@ export declare class ConfigurationResolverExpression<T> implements IConfiguratio
     ]>;
     resolve(replacement: Replacement, data: string | IResolvedValue): void;
     private _resolveAtLocation;
+    private _renameKeyInLocations;
     toObject(): T;
 }
 export {};

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

@@ -89,6 +89,7 @@ class ConfigurationResolverExpression {
             return;
         }
         for (const [key, value] of Object.entries(obj)) {
+            this.parseString(obj, key, key, true);
             if (typeof value === 'string') {
                 this.parseString(obj, key, value);
             }
@@ -96,9 +97,6 @@ class ConfigurationResolverExpression {
                 this.parseObject(value);
             }
         }
-        for (const [key] of Object.entries(obj)) {
-            this.parseString(obj, key, key, true);
-        }
     }
     parseString(object, propertyName, value, replaceKeyName, replacementPath) {
         let pos = 0;
@@ -179,14 +177,24 @@ class ConfigurationResolverExpression {
             const newKey = propertyName.replaceAll(replacement.id, data.value);
             delete object[propertyName];
             object[newKey] = value;
+            this._renameKeyInLocations(object, propertyName, newKey);
             this.parseString(object, newKey, data.value, true, path);
         }
         else {
-            this.parseString(object, propertyName, data.value, false, path);
             object[propertyName] = object[propertyName].replaceAll(replacement.id, data.value);
+            this.parseString(object, propertyName, data.value, false, path);
         }
         path.pop();
     }
+    _renameKeyInLocations(obj, oldKey, newKey) {
+        for (const location of ( this.locations.values())) {
+            for (const loc of location.locations) {
+                if (loc.object === obj && loc.propertyName === oldKey) {
+                    loc.propertyName = newKey;
+                }
+            }
+        }
+    }
     toObject() {
         if (this.stringRoot) {
             return this.root.value;

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

@@ -81,7 +81,7 @@ class AbstractVariableResolverService {
                 return normalizeDriveLetter(filePath);
             }
             throw ( new VariableError(variableKind, ( localize(
-                12123,
+                12402,
                 "Variable {0} can not be resolved. Please open an editor.",
                 replacement.id
             ))));
@@ -95,7 +95,7 @@ class AbstractVariableResolverService {
                 }
             }
             throw ( new VariableError(variableKind, ( localize(
-                12124,
+                12403,
                 "Variable {0}: can not find workspace folder of '{1}'.",
                 replacement.id,
                 basename(filePath)
@@ -108,7 +108,7 @@ class AbstractVariableResolverService {
                     return folder;
                 }
                 throw ( new VariableError(variableKind, ( localize(
-                    12125,
+                    12404,
                     "Variable {0} can not be resolved. No such folder '{1}'.",
                     variableKind,
                     argument
@@ -119,13 +119,13 @@ class AbstractVariableResolverService {
             }
             if (this._context.getWorkspaceFolderCount() > 1) {
                 throw ( new VariableError(variableKind, ( localize(
-                    12126,
+                    12405,
                     "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(
-                12127,
+                12406,
                 "Variable {0} can not be resolved. Please open a folder.",
                 variableKind
             ))));
@@ -142,7 +142,7 @@ class AbstractVariableResolverService {
                     return '';
                 }
                 throw ( new VariableError(VariableKind.Env, ( localize(
-                    12128,
+                    12407,
                     "Variable {0} can not be resolved because no environment variable name is given.",
                     replacement.id
                 ))));
@@ -151,7 +151,7 @@ class AbstractVariableResolverService {
                     const config = this._context.getConfigurationValue(folderUri, argument);
                     if (isUndefinedOrNull(config)) {
                         throw ( new VariableError(VariableKind.Config, ( localize(
-                            12129,
+                            12408,
                             "Variable {0} can not be resolved because setting '{1}' not found.",
                             replacement.id,
                             argument
@@ -159,7 +159,7 @@ class AbstractVariableResolverService {
                     }
                     if (isObject(config)) {
                         throw ( new VariableError(VariableKind.Config, ( localize(
-                            12130,
+                            12409,
                             "Variable {0} can not be resolved because '{1}' is a structured value.",
                             replacement.id,
                             argument
@@ -168,7 +168,7 @@ class AbstractVariableResolverService {
                     return config;
                 }
                 throw ( new VariableError(VariableKind.Config, ( localize(
-                    12131,
+                    12410,
                     "Variable {0} can not be resolved because no settings name is given.",
                     replacement.id
                 ))));
@@ -181,7 +181,7 @@ class AbstractVariableResolverService {
                     const ext = await this._context.getExtension(argument);
                     if (!ext) {
                         throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                            12132,
+                            12411,
                             "Variable {0} can not be resolved because the extension {1} is not installed.",
                             replacement.id,
                             argument
@@ -190,7 +190,7 @@ class AbstractVariableResolverService {
                     return this.fsPath(ext.extensionLocation);
                 }
                 throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                    12133,
+                    12412,
                     "Variable {0} can not be resolved because no extension name is given.",
                     replacement.id
                 ))));
@@ -218,7 +218,7 @@ class AbstractVariableResolverService {
                             return environment.userHome;
                         }
                         throw ( new VariableError(VariableKind.UserHome, ( localize(
-                            12134,
+                            12413,
                             "Variable {0} can not be resolved. UserHome path is not defined",
                             replacement.id
                         ))));
@@ -228,7 +228,7 @@ class AbstractVariableResolverService {
                             return lineNumber;
                         }
                         throw ( new VariableError(VariableKind.LineNumber, ( localize(
-                            12135,
+                            12414,
                             "Variable {0} can not be resolved. Make sure to have a line selected in the active editor.",
                             replacement.id
                         ))));
@@ -239,7 +239,7 @@ class AbstractVariableResolverService {
                             return columnNumber;
                         }
                         throw ( new Error(( localize(
-                            12136,
+                            12415,
                             "Variable {0} can not be resolved. Make sure to have a column selected in the active editor.",
                             replacement.id
                         ))));
@@ -250,7 +250,7 @@ class AbstractVariableResolverService {
                             return selectedText;
                         }
                         throw ( new VariableError(VariableKind.SelectedText, ( localize(
-                            12137,
+                            12416,
                             "Variable {0} can not be resolved. Make sure to have some text selected in the active editor.",
                             replacement.id
                         ))));
@@ -322,7 +322,7 @@ class AbstractVariableResolverService {
                 return v;
             }
             throw ( new VariableError(variableKind, ( localize(
-                12138,
+                12417,
                 "Variable {0} can not be resolved because the command has no value.",
                 match
             ))));

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

@@ -1,15 +1,15 @@
 import { Event } from "../../../../base/common/event.js";
-import { IEditorPane, GroupIdentifier, EditorInputWithOptions, CloseDirection, IEditorPartOptions, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, IEditorWillMoveEvent, IMatchEditorOptions, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions } from "../../../common/editor.js";
+import { IEditorPane, GroupIdentifier, EditorInputWithOptions, CloseDirection, IEditorPartOptions, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, IEditorCloseEvent, IUntypedEditorInput, IEditorWillMoveEvent, IMatchEditorOptions, IActiveEditorChangeEvent, IFindEditorOptions, IToolbarActions } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
 import { IEditorOptions } from "../../../../platform/editor/common/editor.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
-import { IDimension } from "../../../../editor/common/core/dimension.js";
+import { IDimension } from "../../../../editor/common/core/2d/dimension.js";
 import { DisposableStore, IDisposable } from "../../../../base/common/lifecycle.js";
 import { ContextKeyValue, RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IGroupModelChangeEvent } from "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel";
-import { IMenuChangeEvent } from "../../../../platform/actions/common/actions.js";
+import { IMenuChangeEvent, MenuId } from "../../../../platform/actions/common/actions.js";
 import { DeepPartial } from "../../../../base/common/types.js";
 export declare enum GroupDirection {
     UP = 0,
@@ -93,6 +93,7 @@ export interface IEditorGroupsContainer {
     readonly onDidChangeGroupIndex: Event<IEditorGroup>;
     readonly onDidChangeGroupLocked: Event<IEditorGroup>;
     readonly onDidChangeGroupMaximized: Event<boolean>;
+    readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
     readonly isReady: boolean;
     readonly whenReady: Promise<void>;
     readonly whenRestored: Promise<void>;
@@ -102,6 +103,8 @@ export interface IEditorGroupsContainer {
     readonly groups: readonly IEditorGroup[];
     readonly count: number;
     readonly orientation: GroupOrientation;
+    readonly partOptions: IEditorPartOptions;
+    enforcePartOptions(options: DeepPartial<IEditorPartOptions>): IDisposable;
     getGroups(order: GroupsOrder): readonly IEditorGroup[];
     getGroup(identifier: GroupIdentifier): IEditorGroup | undefined;
     activateGroup(group: IEditorGroup | GroupIdentifier): IEditorGroup;
@@ -137,7 +140,6 @@ export interface IEditorPart extends IEditorGroupsContainer {
     hasMaximizedGroup(): boolean;
     centerLayout(active: boolean): void;
     isLayoutCentered(): boolean;
-    enforcePartOptions(options: DeepPartial<IEditorPartOptions>): IDisposable;
 }
 export interface IAuxiliaryEditorPart extends IEditorPart {
     close(): boolean;
@@ -218,7 +220,7 @@ export interface IEditorGroup {
     unstickEditor(editor?: EditorInput): void;
     lock(locked: boolean): void;
     focus(): void;
-    createEditorActions(disposables: DisposableStore): IActiveEditorActions;
+    createEditorActions(disposables: DisposableStore, menuId?: MenuId): IActiveEditorActions;
 }
 export declare function isEditorGroup(obj: unknown): obj is IEditorGroup;
 export declare function preferredSideBySideGroupDirection(configurationService: IConfigurationService): GroupDirection.DOWN | GroupDirection.RIGHT;

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

@@ -3,7 +3,7 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ContextKeyValue } from "../../../../platform/contextkey/common/contextkey.js";
 import { type IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IRectangle } from "../../../../platform/window/common/window.js";
-import { GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent } from "../../../common/editor.js";
+import { GroupIdentifier } from "../../../common/editor.js";
 import { IEditorGroupsContainer, IAuxiliaryEditorPart, IEditorPart, IEditorGroup, IEditorWorkingSet, IEditorWorkingSetOptions, IEditorGroupContextKeyProvider } from "./editorGroupsService.js";
 export declare const IEditorGroupsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IEditorGroupsService>;
 export interface IEditorGroupsService extends IEditorGroupsContainer {
@@ -13,11 +13,10 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
     readonly parts: ReadonlyArray<IEditorPart>;
     getPart(group: IEditorGroup | GroupIdentifier): IEditorPart;
     getPart(container: unknown): IEditorPart;
-    readonly partOptions: IEditorPartOptions;
-    readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
     createAuxiliaryEditorPart(options?: {
         bounds?: Partial<IRectangle>;
         compact?: boolean;
+        alwaysOnTop?: boolean;
     }): Promise<IAuxiliaryEditorPart>;
     getScopedInstantiationService(part: IEditorPart): IInstantiationService;
     saveWorkingSet(name: string): IEditorWorkingSet;

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

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

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

@@ -45,5 +45,5 @@ export interface IEditorService {
     saveAll(options?: ISaveAllEditorsOptions): Promise<ISaveEditorsResult>;
     revert(editors: IEditorIdentifier | IEditorIdentifier[], options?: IRevertOptions): Promise<boolean>;
     revertAll(options?: IRevertAllEditorsOptions): Promise<boolean>;
-    createScoped(editorGroupsContainer: IEditorGroupsContainer | "main", disposables: DisposableStore): IEditorService;
+    createScoped(editorGroupsContainer: IEditorGroupsContainer, disposables: DisposableStore): IEditorService;
 }

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

@@ -16,7 +16,6 @@ export declare enum ExtensionInstallLocation {
     Remote = 2,
     Web = 3
 }
-export declare const getDefaultIconPath: () => string;
 export interface IResourceExtension {
     readonly type: "resource";
     readonly identifier: IExtensionIdentifier;