development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Skip loadScriptSource if we know the preload is already supposed to be a module (#164405)

Browse source
This commit is contained in:
Matt Bierner 2022-10-24 00:29:45 -07:00 committed by GitHub
parent 5f14f1b13b
commit 5c1f34e212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
View file

@ -247,17 +247,16 @@ async function webviewPreloads(ctx: PreloadContext) {
return new Function(...args.map(([k]) => k), functionSrc)(...args.map(([, v]) => v));
};
const runKernelPreload = async (url: string, originalUri: string, forceLoadAsModule: boolean): Promise<void> => {
async function runKernelPreload(url: string, originalUri: string, forceLoadAsModule: boolean): Promise<void> {
if (forceLoadAsModule) {
return activateModuleKernelPreload(url);
}
const text = await loadScriptSource(url, originalUri);
const isModule = /\bexport\b.*\bactivate\b/.test(text);
try {
if (isModule || forceLoadAsModule) {
const module: KernelPreloadModule = await __import(url);
if (!module.activate) {
console.error(`Notebook preload (${url}) looks like a module but does not export an activate function`);
return;
}
return module.activate(createKernelContext());
if (isModule) {
return activateModuleKernelPreload(url);
} else {
return invokeSourceWithGlobals(text, { ...kernelPreloadGlobals, scriptUrl: url });
}
@ -265,7 +264,16 @@ async function webviewPreloads(ctx: PreloadContext) {
console.error(e);
throw e;
}
};
}
async function activateModuleKernelPreload(url: string) {
const module: KernelPreloadModule = await __import(url);
if (!module.activate) {
console.error(`Notebook preload '${url}' was expected to be a module but it does not export an 'activate' function`);
return;
}
return module.activate(createKernelContext());
}
const dimensionUpdater = new class {
private readonly pending = new Map<string, webviewMessages.DimensionUpdate>();