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

Merge branch 'main' into dev/mjbvz/legitimate-squirrel

Browse Source
This commit is contained in:
Matt Bierner
2026-02-12 12:37:14 -08:00
parent c679b20148 c13b565ab7
commit 5d33f345e1
2918 changed files with 214183 additions and 86910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
import { ILogger } from './logging';
import { MarkdownContributionProvider } from './markdownExtensions';
import { MarkdownPreviewConfiguration } from './preview/previewConfig';
import { Slugifier } from './slugify';
import { ISlugifier, SlugBuilder } from './slugify';
import { ITextDocument } from './types/textDocument';
import { WebviewResourceProvider } from './util/resources';
import { isOfScheme, Schemes } from './util/schemes';
@@ -84,13 +84,14 @@ export interface RenderOutput {
}
interface RenderEnv {
containingImages: Set<string>;
currentDocument: vscode.Uri | undefined;
resourceProvider: WebviewResourceProvider | undefined;
readonly containingImages: Set<string>;
readonly currentDocument: vscode.Uri | undefined;
readonly resourceProvider: WebviewResourceProvider | undefined;
readonly slugifier: SlugBuilder;
}
export interface IMdParser {
readonly slugifier: Slugifier;
readonly slugifier: ISlugifier;
tokenize(document: ITextDocument): Promise<MarkdownIt.Token[]>;
}
@@ -99,14 +100,13 @@ export class MarkdownItEngine implements IMdParser {
private _md?: Promise<MarkdownIt>;
private _slugCount = new Map<string, number>();
private readonly _tokenCache = new TokenCache();
public readonly slugifier: Slugifier;
public readonly slugifier: ISlugifier;
public constructor(
private readonly _contributionProvider: MarkdownContributionProvider,
slugifier: Slugifier,
slugifier: ISlugifier,
private readonly _logger: ILogger,
) {
this.slugifier = slugifier;
@@ -181,7 +181,6 @@ export class MarkdownItEngine implements IMdParser {
): MarkdownIt.Token[] {
const cached = this._tokenCache.tryGetCached(document, config);
if (cached) {
this._resetSlugCount();
return cached;
}
@@ -192,13 +191,13 @@ export class MarkdownItEngine implements IMdParser {
}
private _tokenizeString(text: string, engine: MarkdownIt) {
this._resetSlugCount();
return engine.parse(text, {});
}
private _resetSlugCount(): void {
this._slugCount = new Map<string, number>();
const env: RenderEnv = {
currentDocument: undefined,
containingImages: new Set<string>(),
slugifier: this.slugifier.createBuilder(),
resourceProvider: undefined,
};
return engine.parse(text, env);
}
public async render(input: ITextDocument | string, resourceProvider?: WebviewResourceProvider): Promise<RenderOutput> {
@@ -213,6 +212,7 @@ export class MarkdownItEngine implements IMdParser {
containingImages: new Set<string>(),
currentDocument: typeof input === 'string' ? undefined : input.uri,
resourceProvider,
slugifier: this.slugifier.createBuilder(),
};
const html = engine.renderer.render(tokens, {
@@ -311,18 +311,9 @@ export class MarkdownItEngine implements IMdParser {
private _addNamedHeaders(md: MarkdownIt): void {
const original = md.renderer.rules.heading_open;
md.renderer.rules.heading_open = (tokens: MarkdownIt.Token[], idx: number, options, env, self) => {
md.renderer.rules.heading_open = (tokens: MarkdownIt.Token[], idx: number, options, env: unknown, self) => {
const title = this._tokenToPlainText(tokens[idx + 1]);
let slug = this.slugifier.fromHeading(title);
if (this._slugCount.has(slug.value)) {
const count = this._slugCount.get(slug.value)!;
this._slugCount.set(slug.value, count + 1);
slug = this.slugifier.fromHeading(slug.value + '-' + (count + 1));
} else {
this._slugCount.set(slug.value, 0);
}
const slug = (env as RenderEnv).slugifier ? (env as RenderEnv).slugifier.add(title) : this.slugifier.fromHeading(title);
tokens[idx].attrSet('id', slug.value);
if (original) {