@codingame/monaco-vscode-api 22.1.8 → 23.0.0

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js

@@ -109,7 +109,7 @@ class AbstractKeybindingService extends Disposable {
                 throw illegalState('impossible');
             case 1:
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1921,
+                    1930,
                     "({0}) was pressed. Waiting for second key of chord...",
                     keypressLabel
                 )));
@@ -117,7 +117,7 @@ class AbstractKeybindingService extends Disposable {
             default: {
                 const fullKeypressLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1922,
+                    1931,
                     "({0}) was pressed. Waiting for next key of chord...",
                     fullKeypressLabel
                 )));
@@ -222,7 +222,7 @@ class AbstractKeybindingService extends Disposable {
                     const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                     this._log(`+ Leaving multi-chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                     this._notificationService.status(( localize(
-                        1923,
+                        1932,
                         "The key combination ({0}, {1}) is not a command.",
                         currentChordsLabel,
                         keypressLabel
@@ -246,7 +246,7 @@ class AbstractKeybindingService extends Disposable {
                         const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                         this._log(`+ Leaving chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                         this._notificationService.status(( localize(
-                            1923,
+                            1932,
                             "The key combination ({0}, {1}) is not a command.",
                             currentChordsLabel,
                             keypressLabel

package/vscode/src/vs/platform/keybinding/common/keybinding.service.d.ts

@@ -10,8 +10,8 @@ export declare const IKeybindingService: import("../../instantiation/common/inst
 export interface IKeybindingService {
     readonly _serviceBrand: undefined;
     readonly inChordMode: boolean;
+    readonly onDidUpdateKeybindings: Event<void>;
     registerContainer(container: HTMLElement): IDisposable;
-    onDidUpdateKeybindings: Event<void>;
     /**
     * Returns none, one or many (depending on keyboard layout)!
     */

package/vscode/src/vs/platform/keybinding/common/keybindingsRegistry.d.ts

@@ -53,14 +53,14 @@ export declare enum KeybindingWeight {
     BuiltinExtension = 300,
     ExternalExtension = 400
 }
-export interface ICommandAndKeybindingRule extends IKeybindingRule {
-    handler: ICommandHandler;
+export interface ICommandAndKeybindingRule<Args extends unknown[] = unknown[]> extends IKeybindingRule {
+    handler: ICommandHandler<Args>;
     metadata?: ICommandMetadata | null;
 }
 export interface IKeybindingsRegistry {
     registerKeybindingRule(rule: IKeybindingRule): IDisposable;
     setExtensionKeybindings(rules: IExtensionKeybindingRule[]): void;
-    registerCommandAndKeybindingRule(desc: ICommandAndKeybindingRule): IDisposable;
+    registerCommandAndKeybindingRule<Args extends unknown[] = unknown[]>(desc: ICommandAndKeybindingRule<Args>): IDisposable;
     getDefaultKeybindings(): IKeybindingItem[];
 }
 export declare const KeybindingsRegistry: IKeybindingsRegistry;

package/vscode/src/vs/platform/label/common/label.service.d.ts

@@ -27,7 +27,7 @@ export interface ILabelService {
     getHostTooltip(scheme: string, authority?: string): string | undefined;
     getSeparator(scheme: string, authority?: string): "/" | "\\";
     registerFormatter(formatter: ResourceLabelFormatter): IDisposable;
-    onDidChangeFormatters: Event<IFormatterChangeEvent>;
+    readonly onDidChangeFormatters: Event<IFormatterChangeEvent>;
     /**
     * Registers a formatter that's cached for the machine beyond the lifecycle
     * of the current window. Disposing the formatter _will not_ remove it from

package/vscode/src/vs/platform/languagePacks/common/languagePacks.service.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "../../../base/common/uri.js";
-import { ILanguagePackItem } from "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/platform/languagePacks/common/languagePacks";
+import { ILanguagePackItem } from "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common/vscode/vs/platform/languagePacks/common/languagePacks";
 export declare const ILanguagePackService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ILanguagePackService>;
 export interface ILanguagePackService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/list/browser/listService.js

@@ -792,8 +792,8 @@ function workbenchTreeDataPreamble(accessor, options) {
             indent: typeof configurationService.getValue(treeIndentKey) === 'number' ? configurationService.getValue(treeIndentKey) : undefined,
             renderIndentGuides,
             smoothScrolling: Boolean(configurationService.getValue(listSmoothScrolling)),
-            defaultFindMode: getDefaultTreeFindMode(configurationService),
-            defaultFindMatchType: getDefaultTreeFindMatchType(configurationService),
+            defaultFindMode: options.defaultFindMode ?? getDefaultTreeFindMode(configurationService),
+            defaultFindMatchType: options.defaultFindMatchType ?? getDefaultTreeFindMatchType(configurationService),
             horizontalScrolling,
             scrollByPage: Boolean(configurationService.getValue(scrollByPageKey)),
             paddingBottom: paddingBottom,
@@ -948,19 +948,19 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'workbench',
     order: 7,
-    title: ( localize(1931, "Workbench")),
+    title: ( localize(1940, "Workbench")),
     type: 'object',
     properties: {
         [multiSelectModifierSettingKey]: {
             type: 'string',
             enum: ['ctrlCmd', 'alt'],
             markdownEnumDescriptions: [
-                ( localize(1932, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
-                ( localize(1933, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
+                ( localize(1941, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
+                ( localize(1942, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
             ],
             default: 'ctrlCmd',
             description: ( localize(
-                1934,
+                1943,
                 "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier."
             ))
         },
@@ -969,7 +969,7 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1935,
+                1944,
                 "Controls how to open items in trees and lists using the mouse (if supported). Note that some trees and lists might choose to ignore this setting if it is not applicable."
             ))
         },
@@ -977,59 +977,59 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                1936,
+                1945,
                 "Controls whether lists and trees support horizontal scrolling in the workbench. Warning: turning on this setting has a performance implication."
             ))
         },
         [scrollByPageKey]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1937, "Controls whether clicks in the scrollbar scroll page by page."))
+            description: ( localize(1946, "Controls whether clicks in the scrollbar scroll page by page."))
         },
         [treeIndentKey]: {
             type: 'number',
             default: 8,
             minimum: 4,
             maximum: 40,
-            description: ( localize(1938, "Controls tree indentation in pixels."))
+            description: ( localize(1947, "Controls tree indentation in pixels."))
         },
         [treeRenderIndentGuidesKey]: {
             type: 'string',
             enum: ['none', 'onHover', 'always'],
             default: 'onHover',
-            description: ( localize(1939, "Controls whether the tree should render indent guides."))
+            description: ( localize(1948, "Controls whether the tree should render indent guides."))
         },
         [listSmoothScrolling]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1940, "Controls whether lists and trees have smooth scrolling.")),
+            description: ( localize(1949, "Controls whether lists and trees have smooth scrolling.")),
         },
         [mouseWheelScrollSensitivityKey]: {
             type: 'number',
             default: 1,
             markdownDescription: ( localize(
-                1941,
+                1950,
                 "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events."
             ))
         },
         [fastScrollSensitivityKey]: {
             type: 'number',
             default: 5,
-            markdownDescription: ( localize(1942, "Scrolling speed multiplier when pressing `Alt`."))
+            markdownDescription: ( localize(1951, "Scrolling speed multiplier when pressing `Alt`."))
         },
         [defaultFindModeSettingKey]: {
             type: 'string',
             enum: ['highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1943,
+                1952,
                 "Highlight elements when searching. Further up and down navigation will traverse only the highlighted elements."
             )),
-                ( localize(1944, "Filter elements when searching."))
+                ( localize(1953, "Filter elements when searching."))
             ],
             default: 'highlight',
             description: ( localize(
-                1945,
+                1954,
                 "Controls the default find mode for lists and trees in the workbench."
             ))
         },
@@ -1038,26 +1038,26 @@ configurationRegistry.registerConfiguration({
             enum: ['simple', 'highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1946,
+                1955,
                 "Simple keyboard navigation focuses elements which match the keyboard input. Matching is done only on prefixes."
             )),
                 ( localize(
-                1947,
+                1956,
                 "Highlight keyboard navigation highlights elements which match the keyboard input. Further up and down navigation will traverse only the highlighted elements."
             )),
                 ( localize(
-                1948,
+                1957,
                 "Filter keyboard navigation will filter out and hide all the elements which do not match the keyboard input."
             ))
             ],
             default: 'highlight',
             description: ( localize(
-                1949,
+                1958,
                 "Controls the keyboard navigation style for lists and trees in the workbench. Can be simple, highlight and filter."
             )),
             deprecated: true,
             deprecationMessage: ( localize(
-                1950,
+                1959,
                 "Please use 'workbench.list.defaultFindMode' and	'workbench.list.typeNavigationMode' instead."
             ))
         },
@@ -1065,12 +1065,12 @@ configurationRegistry.registerConfiguration({
             type: 'string',
             enum: ['fuzzy', 'contiguous'],
             enumDescriptions: [
-                ( localize(1951, "Use fuzzy matching when searching.")),
-                ( localize(1952, "Use contiguous matching when searching."))
+                ( localize(1960, "Use fuzzy matching when searching.")),
+                ( localize(1961, "Use contiguous matching when searching."))
             ],
             default: 'fuzzy',
             description: ( localize(
-                1953,
+                1962,
                 "Controls the type of matching used when searching lists and trees in the workbench."
             ))
         },
@@ -1079,21 +1079,21 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1954,
+                1963,
                 "Controls how tree folders are expanded when clicking the folder names. Note that some trees and lists might choose to ignore this setting if it is not applicable."
             )),
         },
         [treeStickyScroll]: {
             type: 'boolean',
             default: true,
-            description: ( localize(1955, "Controls whether sticky scrolling is enabled in trees.")),
+            description: ( localize(1964, "Controls whether sticky scrolling is enabled in trees.")),
         },
         [treeStickyScrollMaxElements]: {
             type: 'number',
             minimum: 1,
             default: 7,
             markdownDescription: ( localize(
-                1956,
+                1965,
                 "Controls the number of sticky elements displayed in the tree when {0} is enabled.",
                 '`#workbench.tree.enableStickyScroll#`'
             )),
@@ -1103,7 +1103,7 @@ configurationRegistry.registerConfiguration({
             enum: ['automatic', 'trigger'],
             default: 'automatic',
             markdownDescription: ( localize(
-                1957,
+                1966,
                 "Controls how type navigation works in lists and trees in the workbench. When set to `trigger`, type navigation begins once the `list.triggerTypeNavigation` command is run."
             )),
         }

package/vscode/src/vs/platform/log/common/log.d.ts

@@ -16,14 +16,14 @@ export declare enum LogLevel {
 }
 export declare const DEFAULT_LOG_LEVEL: LogLevel;
 export interface ILogger extends IDisposable {
-    onDidChangeLogLevel: Event<LogLevel>;
+    readonly onDidChangeLogLevel: Event<LogLevel>;
     getLevel(): LogLevel;
     setLevel(level: LogLevel): void;
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
     /**
      * An operation to flush the contents. Can be synchronous.
      */
@@ -95,43 +95,43 @@ export declare abstract class AbstractLogger extends Disposable implements ILogg
     getLevel(): LogLevel;
     protected checkLogLevel(level: LogLevel): boolean;
     protected canLog(level: LogLevel): boolean;
-    abstract trace(message: string, ...args: any[]): void;
-    abstract debug(message: string, ...args: any[]): void;
-    abstract info(message: string, ...args: any[]): void;
-    abstract warn(message: string, ...args: any[]): void;
-    abstract error(message: string | Error, ...args: any[]): void;
+    abstract trace(message: string, ...args: unknown[]): void;
+    abstract debug(message: string, ...args: unknown[]): void;
+    abstract info(message: string, ...args: unknown[]): void;
+    abstract warn(message: string, ...args: unknown[]): void;
+    abstract error(message: string | Error, ...args: unknown[]): void;
     abstract flush(): void;
 }
 export declare abstract class AbstractMessageLogger extends AbstractLogger implements ILogger {
     private readonly logAlways?;
     constructor(logAlways?: boolean | undefined);
     protected checkLogLevel(level: LogLevel): boolean;
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
     flush(): void;
     protected abstract log(level: LogLevel, message: string): void;
 }
 export declare class ConsoleMainLogger extends AbstractLogger implements ILogger {
     private useColors;
     constructor(logLevel?: LogLevel);
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string | Error, ...args: any[]): void;
-    error(message: string, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string | Error, ...args: unknown[]): void;
+    error(message: string, ...args: unknown[]): void;
     flush(): void;
 }
 export declare class ConsoleLogger extends AbstractLogger implements ILogger {
     private readonly useColors;
     constructor(logLevel?: LogLevel, useColors?: boolean);
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string | Error, ...args: any[]): void;
-    error(message: string, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string | Error, ...args: unknown[]): void;
+    error(message: string, ...args: unknown[]): void;
     flush(): void;
 }
 export declare class AdapterLogger extends AbstractLogger implements ILogger {
@@ -139,11 +139,11 @@ export declare class AdapterLogger extends AbstractLogger implements ILogger {
     constructor(adapter: {
         log: (logLevel: LogLevel, args: any[]) => void;
     }, logLevel?: LogLevel);
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string | Error, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string | Error, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
     private extractMessage;
     flush(): void;
 }
@@ -151,11 +151,11 @@ export declare class MultiplexLogger extends AbstractLogger implements ILogger {
     private readonly loggers;
     constructor(loggers: ReadonlyArray<ILogger>);
     setLevel(level: LogLevel): void;
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
     flush(): void;
     dispose(): void;
 }
@@ -199,12 +199,12 @@ export declare class NullLogger implements ILogger {
     readonly onDidChangeLogLevel: Event<LogLevel>;
     setLevel(level: LogLevel): void;
     getLevel(): LogLevel;
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
-    critical(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
+    critical(message: string | Error, ...args: unknown[]): void;
     dispose(): void;
     flush(): void;
 }

package/vscode/src/vs/platform/log/common/log.js

@@ -421,12 +421,12 @@ function LogLevelToString(logLevel) {
 }
 function LogLevelToLocalizedString(logLevel) {
     switch (logLevel) {
-        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1958, "Trace")) };
-        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1959, "Debug")) };
-        case LogLevel.Info: return { original: 'Info', value: ( localize(1960, "Info")) };
-        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1961, "Warning")) };
-        case LogLevel.Error: return { original: 'Error', value: ( localize(1962, "Error")) };
-        case LogLevel.Off: return { original: 'Off', value: ( localize(1963, "Off")) };
+        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1967, "Trace")) };
+        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1968, "Debug")) };
+        case LogLevel.Info: return { original: 'Info', value: ( localize(1969, "Info")) };
+        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1970, "Warning")) };
+        case LogLevel.Error: return { original: 'Error', value: ( localize(1971, "Error")) };
+        case LogLevel.Off: return { original: 'Off', value: ( localize(1972, "Off")) };
     }
 }
 function parseLogLevel(logLevel) {

package/vscode/src/vs/platform/log/common/logService.d.ts

@@ -9,10 +9,10 @@ export declare class LogService extends Disposable implements ILogService {
     get onDidChangeLogLevel(): Event<LogLevel>;
     setLevel(level: LogLevel): void;
     getLevel(): LogLevel;
-    trace(message: string, ...args: any[]): void;
-    debug(message: string, ...args: any[]): void;
-    info(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
-    error(message: string | Error, ...args: any[]): void;
+    trace(message: string, ...args: unknown[]): void;
+    debug(message: string, ...args: unknown[]): void;
+    info(message: string, ...args: unknown[]): void;
+    warn(message: string, ...args: unknown[]): void;
+    error(message: string | Error, ...args: unknown[]): void;
     flush(): void;
 }

package/vscode/src/vs/platform/markdown/browser/markdownRenderer.d.ts

@@ -0,0 +1,32 @@
+import { IRenderedMarkdown, MarkdownRenderOptions } from "../../../base/browser/markdownRenderer.js";
+import { IMarkdownString, MarkdownStringTrustedOptions } from "../../../base/common/htmlContent.js";
+import { IOpenerService } from "../../opener/common/opener.service.js";
+import { IMarkdownRendererService } from "./markdownRenderer.service.js";
+/**
+ * Renders markdown to HTML.
+ *
+ * This interface allows a upper level component to pass a custom markdown renderer to sub-components.
+ *
+ * If you want to render markdown content in a standard way, prefer using the {@linkcode IMarkdownRendererService}.
+ */
+export interface IMarkdownRenderer {
+    render(markdown: IMarkdownString, options?: MarkdownRenderOptions, outElement?: HTMLElement): IRenderedMarkdown;
+}
+export interface IMarkdownRendererExtraOptions {
+    /**
+     * The context in which the markdown is being rendered.
+     */
+    readonly context?: unknown;
+}
+export interface IMarkdownCodeBlockRenderer {
+    renderCodeBlock(languageAlias: string | undefined, value: string, options: IMarkdownRendererExtraOptions): Promise<HTMLElement>;
+}
+export declare class MarkdownRendererService implements IMarkdownRendererService {
+    private readonly _openerService;
+    readonly _serviceBrand: undefined;
+    private _defaultCodeBlockRenderer;
+    constructor(_openerService: IOpenerService);
+    render(markdown: IMarkdownString, options?: MarkdownRenderOptions & IMarkdownRendererExtraOptions, outElement?: HTMLElement): IRenderedMarkdown;
+    setDefaultCodeBlockRenderer(renderer: IMarkdownCodeBlockRenderer): void;
+}
+export declare function openLinkFromMarkdown(openerService: IOpenerService, link: string, isTrusted: boolean | MarkdownStringTrustedOptions | undefined, skipValidation?: boolean): Promise<boolean>;

package/vscode/src/vs/platform/markdown/browser/markdownRenderer.js

@@ -0,0 +1,61 @@
+
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { createElement } from '../../../base/browser/dom.js';
+import { renderMarkdown } from '../../../base/browser/markdownRenderer.js';
+import { onUnexpectedError } from '../../../base/common/errors.js';
+import '../../instantiation/common/extensions.js';
+import { IOpenerService } from '../../opener/common/opener.service.js';
+import '../../instantiation/common/instantiation.js';
+
+let MarkdownRendererService = class MarkdownRendererService {
+    constructor(_openerService) {
+        this._openerService = _openerService;
+    }
+    render(markdown, options, outElement) {
+        const resolvedOptions = { ...options };
+        if (!resolvedOptions.actionHandler) {
+            resolvedOptions.actionHandler = (link, mdStr) => {
+                return openLinkFromMarkdown(this._openerService, link, mdStr.isTrusted);
+            };
+        }
+        if (!resolvedOptions.codeBlockRenderer) {
+            resolvedOptions.codeBlockRenderer = (alias, value) => {
+                return this._defaultCodeBlockRenderer?.renderCodeBlock(alias, value, resolvedOptions ?? {}) ?? Promise.resolve(createElement('span'));
+            };
+        }
+        const rendered = renderMarkdown(markdown, resolvedOptions, outElement);
+        rendered.element.classList.add('rendered-markdown');
+        return rendered;
+    }
+    setDefaultCodeBlockRenderer(renderer) {
+        this._defaultCodeBlockRenderer = renderer;
+    }
+};
+MarkdownRendererService = ( __decorate([
+    ( __param(0, IOpenerService))
+], MarkdownRendererService));
+async function openLinkFromMarkdown(openerService, link, isTrusted, skipValidation) {
+    try {
+        return await openerService.open(link, {
+            fromUserGesture: true,
+            allowContributedOpeners: true,
+            allowCommands: toAllowCommandsOption(isTrusted),
+            skipValidation
+        });
+    }
+    catch (e) {
+        onUnexpectedError(e);
+        return false;
+    }
+}
+function toAllowCommandsOption(isTrusted) {
+    if (isTrusted === true) {
+        return true;
+    }
+    if (isTrusted && Array.isArray(isTrusted.enabledCommands)) {
+        return isTrusted.enabledCommands;
+    }
+    return false;
+}
+
+export { MarkdownRendererService, openLinkFromMarkdown };

package/vscode/src/vs/platform/markdown/browser/markdownRenderer.service.d.ts

@@ -0,0 +1,17 @@
+import { MarkdownRenderOptions, IRenderedMarkdown } from "../../../base/browser/markdownRenderer.js";
+import { IMarkdownString } from "../../../base/common/htmlContent.js";
+import { IMarkdownRenderer, IMarkdownRendererExtraOptions, IMarkdownCodeBlockRenderer } from "./markdownRenderer.js";
+export declare const IMarkdownRendererService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IMarkdownRendererService>;
+/**
+* Service that renders markdown content in a standard manner.
+*
+* Unlike the lower-level {@linkcode renderMarkdown} function, this includes built-in support for features such as syntax
+* highlighting of code blocks and link handling.
+*
+* This service should be preferred for rendering markdown in most cases.
+*/
+export interface IMarkdownRendererService extends IMarkdownRenderer {
+    readonly _serviceBrand: undefined;
+    render(markdown: IMarkdownString, options?: MarkdownRenderOptions & IMarkdownRendererExtraOptions, outElement?: HTMLElement): IRenderedMarkdown;
+    setDefaultCodeBlockRenderer(renderer: IMarkdownCodeBlockRenderer): void;
+}

package/vscode/src/vs/platform/markdown/browser/markdownRenderer.service.js

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

package/vscode/src/vs/platform/markers/common/markerService.js

@@ -252,9 +252,9 @@ class MarkerService {
     }
     _createFilteredMarker(resource, reasons) {
         const message = reasons.length === 1
-            ? ( localize(1964, "Problems are paused because: \"{0}\"", reasons[0]))
+            ? ( localize(1973, "Problems are paused because: \"{0}\"", reasons[0]))
             : ( localize(
-            1965,
+            1974,
             "Problems are paused because: \"{0}\" and {1} more",
             reasons[0],
             reasons.length - 1

package/vscode/src/vs/platform/markers/common/markers.js

@@ -20,17 +20,17 @@ var MarkerSeverity;
     }
     MarkerSeverity.compare = compare;
     const _displayStrings = Object.create(null);
-    _displayStrings[MarkerSeverity.Error] = ( localize(1966, "Error"));
-    _displayStrings[MarkerSeverity.Warning] = ( localize(1967, "Warning"));
-    _displayStrings[MarkerSeverity.Info] = ( localize(1968, "Info"));
+    _displayStrings[MarkerSeverity.Error] = ( localize(1975, "Error"));
+    _displayStrings[MarkerSeverity.Warning] = ( localize(1976, "Warning"));
+    _displayStrings[MarkerSeverity.Info] = ( localize(1977, "Info"));
     function toString(a) {
         return _displayStrings[a] || '';
     }
     MarkerSeverity.toString = toString;
     const _displayStringsPlural = Object.create(null);
-    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1969, "Errors"));
-    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1970, "Warnings"));
-    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1971, "Infos"));
+    _displayStringsPlural[MarkerSeverity.Error] = ( localize(1978, "Errors"));
+    _displayStringsPlural[MarkerSeverity.Warning] = ( localize(1979, "Warnings"));
+    _displayStringsPlural[MarkerSeverity.Info] = ( localize(1980, "Infos"));
     function toStringPlural(a) {
         return _displayStringsPlural[a] || '';
     }

package/vscode/src/vs/platform/mcp/common/mcpGalleryManifest.d.ts

@@ -1,8 +1,9 @@
 export declare enum McpGalleryResourceType {
     McpServersQueryService = "McpServersQueryService",
-    McpServersSearchService = "McpServersSearchService",
     McpServerWebUri = "McpServerWebUriTemplate",
-    McpServerResourceUri = "McpServerResourceUriTemplate",
+    McpServerVersionUri = "McpServerVersionUriTemplate",
+    McpServerIdUri = "McpServerIdUriTemplate",
+    McpServerLatestVersionUri = "McpServerLatestVersionUriTemplate",
     McpServerNamedResourceUri = "McpServerNamedResourceUriTemplate",
     PublisherUriTemplate = "PublisherUriTemplate",
     ContactSupportUri = "ContactSupportUri",
@@ -15,7 +16,7 @@ export type McpGalleryManifestResource = {
     readonly type: string;
 };
 export interface IMcpGalleryManifest {
-    readonly version?: string;
+    readonly version: string;
     readonly url: string;
     readonly resources: readonly McpGalleryManifestResource[];
 }