Skip to content

fix: don't cache rejected oniguruma WASM load promise (fixes #326825) #326830

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

Merged
vs-code-engineering merged 2 commits into from
Aug 23, 2026
Merged

fix: don't cache rejected oniguruma WASM load promise (fixes #326825) #326830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc648cf
fix: don't cache rejected oniguruma WASM load promise (fixes #326825)
vs-code-engineering[bot] Jul 21, 2026
c45217d
Attestation commit
alexdima Aug 22, 2026
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
25 changes: 17 additions & 8 deletions src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,14 +378,23 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
private _getVSCodeOniguruma(): Promise<typeof import('vscode-oniguruma')> {
if (!this._vscodeOniguruma) {
this._vscodeOniguruma = (async () => {
const [vscodeOniguruma, wasm] = await Promise.all([importAMDNodeModule<typeof import('vscode-oniguruma')>('vscode-oniguruma', 'release/main.js'), this._loadVSCodeOnigurumaWASM()]);
await vscodeOniguruma.loadWASM({
data: wasm,
print: (str: string) => {
this._debugModePrintFunc(str);
}
});
return vscodeOniguruma;
try {
const [vscodeOniguruma, wasm] = await Promise.all([importAMDNodeModule<typeof import('vscode-oniguruma')>('vscode-oniguruma', 'release/main.js'), this._loadVSCodeOnigurumaWASM()]);
await vscodeOniguruma.loadWASM({
data: wasm,
print: (str: string) => {
this._debugModePrintFunc(str);
}
});
return vscodeOniguruma;
} catch (err) {
// Do not cache a rejected promise: loading the WASM can fail with a transient
// error (e.g. "Failed to fetch" while the window is being torn down). Caching
// the rejection would permanently break tokenization for the rest of the
// session and cause the same error to be re-reported for every language.
this._vscodeOniguruma = null;
Comment thread
alexdima marked this conversation as resolved.
throw err;
}
Comment thread
vs-code-engineering[bot] marked this conversation as resolved.
})();
}
return this._vscodeOniguruma;
Expand Down
Loading