Skip to content

perf: cache highlighter promises by key #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benvinegar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: cache highlighter promises by key #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/ui/diff/pierre.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ function pierreRenderOptions(appearance: AppTheme["appearance"]) {
}

type HighlightOptions = ReturnType<typeof getHighlighterOptions>;
type Highlighter = Awaited<ReturnType<typeof getSharedHighlighter>>;

const highlighterOptionsByKey = new Map<string, HighlightOptions>();
const highlighterPromiseCache = new Map<string, Promise<Highlighter>>();
let queuedHighlightWork = Promise.resolve();

type HastNode = HastTextNode | HastElementNode;
Expand Down Expand Up @@ -352,6 +354,11 @@ async function prepareHighlighter(
) {
const resolvedLanguage = language ?? "text";
const cacheKey = `${appearance}:${resolvedLanguage}`;
const cached = highlighterPromiseCache.get(cacheKey);
if (cached) {
return cached;
}

const options =
highlighterOptionsByKey.get(cacheKey) ??
getHighlighterOptions(resolvedLanguage, {
Expand All @@ -362,10 +369,16 @@ async function prepareHighlighter(
highlighterOptionsByKey.set(cacheKey, options);
}

return getSharedHighlighter({
const highlighterPromise = getSharedHighlighter({
...options,
preferredHighlighter: "shiki-wasm",
}).catch((error) => {
highlighterPromiseCache.delete(cacheKey);
throw error;
});

highlighterPromiseCache.set(cacheKey, highlighterPromise);
return highlighterPromise;
}

/** Queue highlight rendering so startup work stays serialized in request order. */
Expand Down
Loading