@codingame/monaco-vscode-api 33.0.9 → 34.0.0

package/vscode/src/vs/base/common/map.d.ts

@@ -37,13 +37,13 @@ export declare class ResourceMap<T> implements Map<URI, T> {
     clear(): void;
     delete(resource: URI): boolean;
     forEach(clb: (value: T, key: URI, map: Map<URI, T>) => void, thisArg?: object): void;
-    values(): IterableIterator<T>;
-    keys(): IterableIterator<URI>;
-    entries(): IterableIterator<[
+    values(): MapIterator<T>;
+    keys(): MapIterator<URI>;
+    entries(): MapIterator<[
         URI,
         T
     ]>;
-    [Symbol.iterator](): IterableIterator<[
+    [Symbol.iterator](): MapIterator<[
         URI,
         T
     ]>;
@@ -59,13 +59,13 @@ export declare class ResourceSet implements Set<URI> {
     delete(value: URI): boolean;
     forEach(callbackfn: (value: URI, value2: URI, set: Set<URI>) => void, thisArg?: unknown): void;
     has(value: URI): boolean;
-    entries(): IterableIterator<[
+    entries(): SetIterator<[
         URI,
         URI
     ]>;
-    keys(): IterableIterator<URI>;
-    values(): IterableIterator<URI>;
-    [Symbol.iterator](): IterableIterator<URI>;
+    keys(): SetIterator<URI>;
+    values(): SetIterator<URI>;
+    [Symbol.iterator](): SetIterator<URI>;
 }
 export declare enum Touch {
     None = 0,
@@ -91,14 +91,14 @@ export declare class LinkedMap<K, V> implements Map<K, V> {
     delete(key: K): boolean;
     remove(key: K): V | undefined;
     shift(): V | undefined;
-    forEach(callbackfn: (value: V, key: K, map: LinkedMap<K, V>) => void, thisArg?: unknown): void;
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    entries(): IterableIterator<[
+    forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: unknown): void;
+    keys(): MapIterator<K>;
+    values(): MapIterator<V>;
+    entries(): MapIterator<[
         K,
         V
     ]>;
-    [Symbol.iterator](): IterableIterator<[
+    [Symbol.iterator](): MapIterator<[
         K,
         V
     ]>;

package/vscode/src/vs/base/common/map.js

@@ -257,6 +257,7 @@ class LinkedMap {
             [Symbol.iterator]() {
                 return iterator;
             },
+            [Symbol.dispose]() {},
             next() {
                 if (map._state !== state) {
                     throw ( new Error(`LinkedMap got modified during iteration.`));
@@ -286,6 +287,7 @@ class LinkedMap {
             [Symbol.iterator]() {
                 return iterator;
             },
+            [Symbol.dispose]() {},
             next() {
                 if (map._state !== state) {
                     throw ( new Error(`LinkedMap got modified during iteration.`));
@@ -315,6 +317,7 @@ class LinkedMap {
             [Symbol.iterator]() {
                 return iterator;
             },
+            [Symbol.dispose]() {},
             next() {
                 if (map._state !== state) {
                     throw ( new Error(`LinkedMap got modified during iteration.`));

package/vscode/src/vs/base/common/oauth.d.ts

@@ -2,6 +2,53 @@ export declare const AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH = "/.well-k
 export declare const AUTH_SERVER_METADATA_DISCOVERY_PATH = "/.well-known/oauth-authorization-server";
 export declare const OPENID_CONNECT_DISCOVERY_PATH = "/.well-known/openid-configuration";
 export declare const AUTH_SCOPE_SEPARATOR = " ";
+/**
+ * RFC 8693 grant type for OAuth token exchange.
+ */
+export declare const GRANT_TYPE_TOKEN_EXCHANGE = "urn:ietf:params:oauth:grant-type:token-exchange";
+/**
+ * RFC 8693 token type for an OAuth 2.0 access token used as the `subject_token`
+ * during a token exchange.
+ */
+export declare const TOKEN_TYPE_ACCESS_TOKEN = "urn:ietf:params:oauth:token-type:access_token";
+/**
+ * Token type for an OpenID Connect ID Token. Used as the `subject_token_type` in
+ * the IdP-side token exchange that mints an ID-JAG.
+ */
+export declare const TOKEN_TYPE_ID_TOKEN = "urn:ietf:params:oauth:token-type:id_token";
+/**
+ * Token type for an Identity Assertion Authorization Grant (ID-JAG) used in
+ * Cross App Access (XAA) flows.
+ */
+export declare const TOKEN_TYPE_ID_JAG = "urn:ietf:params:oauth:token-type:id-jag";
+/**
+ * RFC 7523 grant type used to exchange a JWT assertion (e.g. an ID-JAG) for an
+ * access token at the resource's authorization server.
+ */
+export declare const GRANT_TYPE_JWT_BEARER = "urn:ietf:params:oauth:grant-type:jwt-bearer";
+/**
+ * Build the request body for the IdP-side token exchange that mints an ID-JAG
+ * for the requested audience. See draft-ietf-oauth-identity-assertion-authz-grant.
+ *
+ * @param clientId the requesting app's client_id at the IdP.
+ * @param clientSecret the requesting app's client_secret at the IdP, if applicable.
+ *   Omit (or pass `undefined`) for public clients (`token_endpoint_auth_method=none`).
+ * @param idToken the OpenID Connect `id_token` previously issued by the IdP to
+ *   the requesting app. Per the spec the subject token MUST be an ID Token
+ *   (not an access token).
+ * @param audience the *authorization server* URL of the resource (the issuer
+ *   that will redeem the ID-JAG). Required.
+ * @param resource the resource indicator (RFC 8707) — the URL of the actual
+ *   protected resource (e.g. the MCP server URL). Optional but typically required
+ *   in practice.
+ * @param scopes scopes the requesting app wants granted at the resource.
+ */
+export declare function buildIdJagExchangeBody(clientId: string, clientSecret: string | undefined, idToken: string, audience: string, resource: string | undefined, scopes: readonly string[]): URLSearchParams;
+/**
+ * Build the request body sent to a resource server's authorization server to
+ * redeem an ID-JAG for a resource-scoped access token (RFC 7523 JWT-bearer grant).
+ */
+export declare function buildResourceRedemptionBody(clientId: string, clientSecret: string | undefined, idJag: string, resource: string | undefined, scopes: readonly string[]): URLSearchParams;
 /**
  * Base OAuth 2.0 error codes as specified in RFC 6749.
  */

package/vscode/src/vs/base/common/oauth.js

@@ -6,6 +6,45 @@ const AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH = `${WELL_KNOWN_ROUTE}/oau
 const AUTH_SERVER_METADATA_DISCOVERY_PATH = `${WELL_KNOWN_ROUTE}/oauth-authorization-server`;
 const OPENID_CONNECT_DISCOVERY_PATH = `${WELL_KNOWN_ROUTE}/openid-configuration`;
 const AUTH_SCOPE_SEPARATOR = " ";
+const GRANT_TYPE_TOKEN_EXCHANGE = "urn:ietf:params:oauth:grant-type:token-exchange";
+const TOKEN_TYPE_ID_TOKEN = "urn:ietf:params:oauth:token-type:id_token";
+const TOKEN_TYPE_ID_JAG = "urn:ietf:params:oauth:token-type:id-jag";
+const GRANT_TYPE_JWT_BEARER = "urn:ietf:params:oauth:grant-type:jwt-bearer";
+function buildIdJagExchangeBody(clientId, clientSecret, idToken, audience, resource, scopes) {
+    const body = ( new URLSearchParams());
+    body.append("client_id", clientId);
+    if (clientSecret) {
+        body.append("client_secret", clientSecret);
+    }
+    body.append("grant_type", GRANT_TYPE_TOKEN_EXCHANGE);
+    body.append("subject_token", idToken);
+    body.append("subject_token_type", TOKEN_TYPE_ID_TOKEN);
+    body.append("requested_token_type", TOKEN_TYPE_ID_JAG);
+    body.append("audience", audience);
+    if (resource) {
+        body.append("resource", resource);
+    }
+    if (scopes.length) {
+        body.append("scope", scopes.join(AUTH_SCOPE_SEPARATOR));
+    }
+    return body;
+}
+function buildResourceRedemptionBody(clientId, clientSecret, idJag, resource, scopes) {
+    const body = ( new URLSearchParams());
+    body.append("client_id", clientId);
+    if (clientSecret) {
+        body.append("client_secret", clientSecret);
+    }
+    body.append("grant_type", GRANT_TYPE_JWT_BEARER);
+    body.append("assertion", idJag);
+    if (resource) {
+        body.append("resource", resource);
+    }
+    if (scopes.length) {
+        body.append("scope", scopes.join(AUTH_SCOPE_SEPARATOR));
+    }
+    return body;
+}
 var AuthorizationErrorType;
 (function(AuthorizationErrorType) {
     AuthorizationErrorType["InvalidRequest"] = "invalid_request";
@@ -456,4 +495,4 @@ async function fetchAuthorizationServerMetadata(authorizationServer, options = {
     }
 }
 
-export { AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH, AUTH_SCOPE_SEPARATOR, AUTH_SERVER_METADATA_DISCOVERY_PATH, AuthorizationDeviceCodeErrorType, AuthorizationErrorType, AuthorizationRegistrationErrorType, DEFAULT_AUTH_FLOW_PORT, OPENID_CONNECT_DISCOVERY_PATH, fetchAuthorizationServerMetadata, fetchDynamicRegistration, fetchResourceMetadata, getClaimsFromJWT, getDefaultMetadataForUrl, isAuthorizationDynamicClientRegistrationResponse, isAuthorizationErrorResponse, isAuthorizationProtectedResourceMetadata, isAuthorizationRegistrationErrorResponse, isAuthorizationServerMetadata, isAuthorizationTokenResponse, parseWWWAuthenticateHeader, scopesMatch };
+export { AUTH_PROTECTED_RESOURCE_METADATA_DISCOVERY_PATH, AUTH_SCOPE_SEPARATOR, AUTH_SERVER_METADATA_DISCOVERY_PATH, AuthorizationDeviceCodeErrorType, AuthorizationErrorType, AuthorizationRegistrationErrorType, DEFAULT_AUTH_FLOW_PORT, GRANT_TYPE_JWT_BEARER, GRANT_TYPE_TOKEN_EXCHANGE, OPENID_CONNECT_DISCOVERY_PATH, TOKEN_TYPE_ID_JAG, TOKEN_TYPE_ID_TOKEN, buildIdJagExchangeBody, buildResourceRedemptionBody, fetchAuthorizationServerMetadata, fetchDynamicRegistration, fetchResourceMetadata, getClaimsFromJWT, getDefaultMetadataForUrl, isAuthorizationDynamicClientRegistrationResponse, isAuthorizationErrorResponse, isAuthorizationProtectedResourceMetadata, isAuthorizationRegistrationErrorResponse, isAuthorizationServerMetadata, isAuthorizationTokenResponse, parseWWWAuthenticateHeader, scopesMatch };

package/vscode/src/vs/base/common/observableInternal/map.d.ts

@@ -10,13 +10,13 @@ export declare class ObservableMap<K, V> implements Map<K, V> {
     delete(key: K, tx?: ITransaction): boolean;
     clear(tx?: ITransaction): void;
     forEach(callbackfn: (value: V, key: K, map: Map<K, V>) => void, thisArg?: unknown): void;
-    entries(): IterableIterator<[
+    entries(): MapIterator<[
         K,
         V
     ]>;
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    [Symbol.iterator](): IterableIterator<[
+    keys(): MapIterator<K>;
+    values(): MapIterator<V>;
+    [Symbol.iterator](): MapIterator<[
         K,
         V
     ]>;

package/vscode/src/vs/base/common/observableInternal/set.d.ts

@@ -8,13 +8,13 @@ export declare class ObservableSet<T> implements Set<T> {
     add(value: T, tx?: ITransaction): this;
     delete(value: T, tx?: ITransaction): boolean;
     clear(tx?: ITransaction): void;
-    forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: any): void;
-    entries(): IterableIterator<[
+    forEach(callbackfn: (value: T, value2: T, set: Set<T>) => void, thisArg?: unknown): void;
+    entries(): SetIterator<[
         T,
         T
     ]>;
-    keys(): IterableIterator<T>;
-    values(): IterableIterator<T>;
-    [Symbol.iterator](): IterableIterator<T>;
+    keys(): SetIterator<T>;
+    values(): SetIterator<T>;
+    [Symbol.iterator](): SetIterator<T>;
     get [Symbol.toStringTag](): string;
 }

package/vscode/src/vs/base/common/product.d.ts

@@ -388,6 +388,7 @@ export interface IDefaultChatAgent {
     readonly entitlementSignupLimitedUrl: string;
     readonly tokenEntitlementUrl: string;
     readonly mcpRegistryDataUrl: string;
+    readonly managedSettingsUrl: string;
     readonly chatQuotaExceededContext: string;
     readonly completionsQuotaExceededContext: string;
     readonly walkthroughCommand: string;

package/vscode/src/vs/base/common/resources.js

@@ -51,7 +51,7 @@ class ExtUri {
                 ) && base.query === parentCandidate.query && (ignoreFragment || base.fragment === parentCandidate.fragment);
             }
             if (isEqualAuthority(base.authority, parentCandidate.authority)) {
-                return isEqualOrParent$1(base.path, parentCandidate.path, this._ignorePathCasing(base), "/") && base.query === parentCandidate.query && (ignoreFragment || base.fragment === parentCandidate.fragment);
+                return isEqualOrParent$1(base.path, parentCandidate.path, this._ignorePathCasing(base), true) && base.query === parentCandidate.query && (ignoreFragment || base.fragment === parentCandidate.fragment);
             }
         }
         return false;

package/vscode/src/vs/base/parts/ipc/common/ipc.d.ts

@@ -82,10 +82,11 @@ export declare class BufferReader implements IReader {
     constructor(buffer: VSBuffer);
     read(bytes: number): VSBuffer;
 }
-export declare class BufferWriter implements IWriter {
+export declare class BufferWriter implements IWriter, IDisposable {
     private buffers;
     get buffer(): VSBuffer;
     write(buffer: VSBuffer): void;
+    dispose(): void;
 }
 export declare function serialize(writer: IWriter, data: any): void;
 export declare function deserialize(reader: IReader): any;

package/vscode/src/vs/base/parts/ipc/common/ipc.js

@@ -109,6 +109,9 @@ class BufferWriter {
     write(buffer) {
         this.buffers.push(buffer);
     }
+    dispose() {
+        this.buffers.length = 0;
+    }
 }
 var DataType;
 (function(DataType) {
@@ -238,9 +241,13 @@ class ChannelServer {
     }
     send(header, body = undefined) {
         const writer = ( new BufferWriter());
-        serialize(writer, header);
-        serialize(writer, body);
-        return this.sendBuffer(writer.buffer);
+        try {
+            serialize(writer, header);
+            serialize(writer, body);
+            return this.sendBuffer(writer.buffer);
+        } finally {
+            writer.dispose();
+        }
     }
     sendBuffer(message) {
         try {
@@ -505,7 +512,12 @@ class ChannelClient {
                     }
                 };
                 this.handlers.set(id, handler);
-                this.sendRequest(request);
+                try {
+                    this.sendRequest(request);
+                } catch (err) {
+                    this.handlers.delete(id);
+                    e(err);
+                }
             };
             let uninitializedPromise = null;
             if (this.state === State.Idle) {
@@ -619,9 +631,13 @@ class ChannelClient {
     }
     send(header, body = undefined) {
         const writer = ( new BufferWriter());
-        serialize(writer, header);
-        serialize(writer, body);
-        return this.sendBuffer(writer.buffer);
+        try {
+            serialize(writer, header);
+            serialize(writer, body);
+            return this.sendBuffer(writer.buffer);
+        } finally {
+            writer.dispose();
+        }
     }
     sendBuffer(message) {
         try {
@@ -694,8 +710,12 @@ ChannelClient.__decorator = ( __decorate([memoize], ChannelClient.prototype, "on
 class IPCClient {
     constructor(protocol, ctx, ipcLogger = null) {
         const writer = ( new BufferWriter());
-        serialize(writer, ctx);
-        protocol.send(writer.buffer);
+        try {
+            serialize(writer, ctx);
+            protocol.send(writer.buffer);
+        } finally {
+            writer.dispose();
+        }
         this.channelClient = ( new ChannelClient(protocol, ipcLogger));
         this.channelServer = ( new ChannelServer(protocol, ctx, ipcLogger));
     }

package/vscode/src/vs/editor/browser/controller/mouseTarget.js

@@ -917,12 +917,13 @@ function shadowCaretRangeFromPoint(shadowRoot, x, y) {
         }
         const rect = el.getBoundingClientRect();
         const elWindow = getWindow(el);
-        const fontStyle = elWindow.getComputedStyle(el, null).getPropertyValue("font-style");
-        const fontVariant = elWindow.getComputedStyle(el, null).getPropertyValue("font-variant");
-        const fontWeight = elWindow.getComputedStyle(el, null).getPropertyValue("font-weight");
-        const fontSize = elWindow.getComputedStyle(el, null).getPropertyValue("font-size");
-        const lineHeight = elWindow.getComputedStyle(el, null).getPropertyValue("line-height");
-        const fontFamily = elWindow.getComputedStyle(el, null).getPropertyValue("font-family");
+        const computedStyle = elWindow.getComputedStyle(el, null);
+        const fontStyle = computedStyle.getPropertyValue("font-style");
+        const fontVariant = computedStyle.getPropertyValue("font-variant");
+        const fontWeight = computedStyle.getPropertyValue("font-weight");
+        const fontSize = computedStyle.getPropertyValue("font-size");
+        const lineHeight = computedStyle.getPropertyValue("line-height");
+        const fontFamily = computedStyle.getPropertyValue("font-family");
         const font = `${fontStyle} ${fontVariant} ${fontWeight} ${fontSize}/${lineHeight} ${fontFamily}`;
         const text = el.innerText;
         let pixelCursor = rect.left;

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.d.ts

@@ -28,7 +28,7 @@ export declare class DiffEditorOptions {
     readonly originalEditable: IObservableWithChange<boolean, void>;
     readonly diffCodeLens: IObservableWithChange<boolean, void>;
     readonly accessibilityVerbose: IObservableWithChange<boolean, void>;
-    readonly diffAlgorithm: IObservableWithChange<"advanced" | "legacy", void>;
+    readonly diffAlgorithm: IObservableWithChange<"advanced" | "legacy" | "advanced-external" | "advanced-wasm", void>;
     readonly showEmptyDecorations: IObservableWithChange<boolean, void>;
     readonly onlyShowAccessibleDiffViewer: IObservableWithChange<boolean, void>;
     readonly compactMode: IObservableWithChange<boolean, void>;

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js

@@ -158,10 +158,15 @@ function validateDiffEditorOptions(options, defaults) {
         diffCodeLens: boolean(options.diffCodeLens, defaults.diffCodeLens),
         renderOverviewRuler: boolean(options.renderOverviewRuler, defaults.renderOverviewRuler),
         diffWordWrap: stringSet(options.diffWordWrap, defaults.diffWordWrap, ["off", "on", "inherit"]),
-        diffAlgorithm: stringSet(options.diffAlgorithm, defaults.diffAlgorithm, ["legacy", "advanced"], {
-            "smart": "legacy",
-            "experimental": "advanced"
-        }),
+        diffAlgorithm: stringSet(
+            options.diffAlgorithm,
+            defaults.diffAlgorithm,
+            ["legacy", "advanced", "advanced-external", "advanced-wasm"],
+            {
+                "smart": "legacy",
+                "experimental": "advanced"
+            }
+        ),
         accessibilityVerbose: boolean(options.accessibilityVerbose, defaults.accessibilityVerbose),
         experimental: {
             showMoves: boolean(options.experimental?.showMoves, defaults.experimental.showMoves),

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.d.ts

@@ -8,7 +8,7 @@ import { IEditorWorkerService } from "../../../common/services/editorWorker.serv
 import { ITelemetryService } from "../../../../platform/telemetry/common/telemetry.service.js";
 import { IDiffProviderFactoryService } from "./diffProviderFactoryService.service.js";
 export interface IDocumentDiffFactoryOptions {
-    readonly diffAlgorithm?: "legacy" | "advanced";
+    readonly diffAlgorithm?: "legacy" | "advanced" | "advanced-external" | "advanced-wasm";
 }
 export declare class WorkerBasedDiffProviderFactoryService implements IDiffProviderFactoryService {
     private readonly instantiationService;
@@ -30,6 +30,6 @@ export declare class WorkerBasedDocumentDiffProvider implements IDocumentDiffPro
     setOptions(newOptions: IWorkerBasedDocumentDiffProviderOptions): void;
 }
 interface IWorkerBasedDocumentDiffProviderOptions {
-    readonly diffAlgorithm?: "legacy" | "advanced" | IDocumentDiffProvider;
+    readonly diffAlgorithm?: "legacy" | "advanced" | "advanced-external" | "advanced-wasm" | IDocumentDiffProvider;
 }
 export {};

package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js

@@ -8,8 +8,8 @@ import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { TextLength } from '../../../common/core/text/textLength.js';
-import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { autorunOpts, autorunHandleChanges, autorun, autorunWithStore } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
 function joinCombine(arr1, arr2, keySelector, combine) {

package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js

@@ -348,14 +348,20 @@ const editorConfiguration = {
         },
         "diffEditor.diffAlgorithm": {
             type: "string",
-            enum: ["legacy", "advanced"],
+            enum: ["legacy", "advanced", "advanced-external", "advanced-wasm"],
             default: diffEditorDefaultOptions.diffAlgorithm,
-            markdownEnumDescriptions: [( localize(284, "Uses the legacy diffing algorithm.")), ( localize(285, "Uses the advanced diffing algorithm."))]
+            markdownEnumDescriptions: [( localize(284, "Uses the legacy diffing algorithm.")), ( localize(285, "Uses the advanced diffing algorithm.")), ( localize(
+                286,
+                "Uses the advanced diffing algorithm from the external `@vscode/diff` package (pure JavaScript)."
+            )), ( localize(
+                287,
+                "Uses the advanced diffing algorithm from the external `@vscode/diff` package (WebAssembly)."
+            ))]
         },
         "diffEditor.hideUnchangedRegions.enabled": {
             type: "boolean",
             default: diffEditorDefaultOptions.hideUnchangedRegions.enabled,
-            markdownDescription: ( localize(286, "Controls whether the diff editor shows unchanged regions.")),
+            markdownDescription: ( localize(288, "Controls whether the diff editor shows unchanged regions.")),
             agentsWindow: {
                 default: true
             }
@@ -363,14 +369,14 @@ const editorConfiguration = {
         "diffEditor.hideUnchangedRegions.revealLineCount": {
             type: "integer",
             default: diffEditorDefaultOptions.hideUnchangedRegions.revealLineCount,
-            markdownDescription: ( localize(287, "Controls how many lines are used for unchanged regions.")),
+            markdownDescription: ( localize(289, "Controls how many lines are used for unchanged regions.")),
             minimum: 1
         },
         "diffEditor.hideUnchangedRegions.minimumLineCount": {
             type: "integer",
             default: diffEditorDefaultOptions.hideUnchangedRegions.minimumLineCount,
             markdownDescription: ( localize(
-                288,
+                290,
                 "Controls how many lines are used as a minimum for unchanged regions."
             )),
             minimum: 1
@@ -379,7 +385,7 @@ const editorConfiguration = {
             type: "integer",
             default: diffEditorDefaultOptions.hideUnchangedRegions.contextLineCount,
             markdownDescription: ( localize(
-                289,
+                291,
                 "Controls how many lines are used as context when comparing unchanged regions."
             )),
             minimum: 1
@@ -387,13 +393,13 @@ const editorConfiguration = {
         "diffEditor.experimental.showMoves": {
             type: "boolean",
             default: diffEditorDefaultOptions.experimental.showMoves,
-            markdownDescription: ( localize(290, "Controls whether the diff editor should show detected code moves."))
+            markdownDescription: ( localize(292, "Controls whether the diff editor should show detected code moves."))
         },
         "diffEditor.experimental.showEmptyDecorations": {
             type: "boolean",
             default: diffEditorDefaultOptions.experimental.showEmptyDecorations,
             description: ( localize(
-                291,
+                293,
                 "Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."
             ))
         },
@@ -401,7 +407,7 @@ const editorConfiguration = {
             type: "boolean",
             default: diffEditorDefaultOptions.experimental.useTrueInlineView,
             description: ( localize(
-                292,
+                294,
                 "If enabled and the editor uses the inline view, word changes are rendered inline."
             ))
         }

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -117,7 +117,7 @@ export interface IDiffEditorBaseOptions {
     /**
      * Diff Algorithm
     */
-    diffAlgorithm?: "legacy" | "advanced";
+    diffAlgorithm?: "legacy" | "advanced" | "advanced-external" | "advanced-wasm";
     /**
      * Whether the diff editor aria label should be verbose.
      */