Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure fenced code blocks properly get line numbers assigned

Browse Source 
Fixes #51095
This commit is contained in:
Matt Bierner
2018-06-04 10:16:58 -07:00
parent 2d4dc13260
commit 7a24ced69f
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/markdown-language-features/src/markdownEngine.ts
View File

@@ -44,10 +44,10 @@ export class MarkdownEngine {
}
if (lang && hljs.getLanguage(lang)) {
try {
return `<pre class="hljs"><code><div>${hljs.highlight(lang, str, true).value}</div></code></pre>`;
return `<div>${hljs.highlight(lang, str, true).value}</div>`;
} catch (error) { }
}
return `<pre class="hljs"><code><div>${this.md!.utils.escapeHtml(str)}</div></code></pre>`;
return `<code><div>${this.md!.utils.escapeHtml(str)}</div>`;
}
}).use(mdnh, {
slugify: (header: string) => this.slugifier.fromHeading(header).value
@@ -57,10 +57,12 @@ export class MarkdownEngine {
this.usePlugin(await plugin);
}
for (const renderName of ['paragraph_open', 'heading_open', 'image', 'code_block', 'blockquote_open', 'list_item_open']) {
for (const renderName of ['paragraph_open', 'heading_open', 'image', 'code_block', 'fence', 'blockquote_open', 'list_item_open']) {
this.addLineNumberRenderer(this.md, renderName);
}
this.addFencedRenderer(this.md);
this.addLinkNormalizer(this.md);
this.addLinkValidator(this.md);
}
@@ -127,6 +129,18 @@ export class MarkdownEngine {
};
}
private addFencedRenderer(md: any): void {
const original = md.renderer.rules['fenced'];
md.renderer.rules['fenced'] = (tokens: any, idx: number, options: any, env: any, self: any) => {
const token = tokens[idx];
if (token.map && token.map.length) {
token.attrJoin('class', 'hljs');
}
return original(tokens, idx, options, env, self);
};
}
private addLinkNormalizer(md: any): void {
const normalizeLink = md.normalizeLink;
md.normalizeLink = (link: string) => {