Skip to content

Commit 10b0fa7

Browse files
committed
Try another fix
1 parent 621e00f commit 10b0fa7

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

src/vs/base/browser/markdownRenderer.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
3939
readonly sanitizerConfig?: MarkdownSanitizerConfig;
4040

4141
readonly markedOptions?: MarkdownRendererMarkedOptions;
42+
readonly markedExtensions?: marked.MarkedExtension[];
4243
}
4344

4445
/**
@@ -47,7 +48,6 @@ export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
4748
export interface MarkdownRendererMarkedOptions {
4849
readonly gfm?: boolean;
4950
readonly breaks?: boolean;
50-
readonly markedExtensions?: marked.MarkedExtension[];
5151
}
5252

5353
export interface MarkdownSanitizerConfig {
@@ -121,7 +121,7 @@ export function renderMarkdown(markdown: IMarkdownString, options: MarkdownRende
121121
const disposables = new DisposableStore();
122122
let isDisposed = false;
123123

124-
const markedInstance = new marked.Marked(...(options.markedOptions?.markedExtensions ?? []));
124+
const markedInstance = new marked.Marked(...(options.markedExtensions ?? []));
125125
const { renderer, codeBlocks, syncCodeBlocks } = createMarkdownRenderer(markedInstance, options, markdown);
126126
const value = preprocessMarkdownString(markdown);
127127

@@ -262,8 +262,7 @@ function rewriteRenderedLinks(markdown: IMarkdownString, options: MarkdownRender
262262
}
263263

264264
function createMarkdownRenderer(marked: marked.Marked, options: MarkdownRenderOptions, markdown: IMarkdownString): { renderer: marked.Renderer; codeBlocks: Promise<[string, HTMLElement]>[]; syncCodeBlocks: [string, HTMLElement][] } {
265-
const markedOptions: marked.MarkedOptions = { ...options.markedOptions };
266-
const renderer = new marked.Renderer(markedOptions);
265+
const renderer = new marked.Renderer(options.markedOptions);
267266
renderer.image = defaultMarkedRenderers.image;
268267
renderer.link = defaultMarkedRenderers.link;
269268
renderer.paragraph = defaultMarkedRenderers.paragraph;

src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
121121
const markedOpts: MarkdownRendererMarkedOptions = isRequestVM(element) ? {
122122
gfm: true,
123123
breaks: true,
124-
markedExtensions,
125-
} : {
126-
markedExtensions,
127-
};
124+
} : {};
128125

129126
const result = this._register(renderer.render(markdown.content, {
130127
sanitizerConfig: MarkedKatexSupport.getSanitizerOptions({
@@ -240,6 +237,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
240237
},
241238
asyncRenderCallback: () => this._onDidChangeHeight.fire(),
242239
markedOptions: markedOpts,
240+
markedExtensions,
243241
}, this.domNode));
244242

245243
const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);

src/vs/workbench/contrib/markdown/test/browser/markdownKatexSupport.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ suite('Markdown Katex Support Test', () => {
2121
allowedTags: basicMarkupHtmlTags,
2222
allowedAttributes: defaultAllowedAttrs,
2323
}),
24-
markedOptions: {
25-
markedExtensions: [katex],
26-
}
24+
markedExtensions: [katex],
2725
}));
2826
return rendered;
2927
}

0 commit comments

Comments
 (0)