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

Move preloadsAndErrors into rerenderOutputCell

Browse Source
This commit is contained in:
Matt Bierner
2021-09-14 16:33:56 -07:00
parent eb1b1607ae
commit 4f5fdbfd60
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+12 -15
View File
@@ -567,18 +567,8 @@ async function webviewPreloads(ctx: PreloadContext) {
case 'html': {
const data = event.data;
outputRunner.enqueue(data.outputId, async (state) => {
const preloadsAndErrors = await Promise.all<unknown>([
data.rendererId ? renderers.load(data.rendererId) : undefined,
...data.requiredPreloads.map(p => kernelPreloads.waitFor(p.uri)),
].map(p => p?.catch(err => err)));
if (state.cancelled) {
return;
}
viewModel.rerenderOutputCell(data, preloadsAndErrors);
outputRunner.enqueue(data.outputId, (state) => {
return viewModel.rerenderOutputCell(data, state);
});
break;
}
@@ -1001,11 +991,18 @@ async function webviewPreloads(ctx: PreloadContext) {
this._outputCells.clear();
}
public rerenderOutputCell(data: webviewMessages.ICreationRequestMessage, preloadsAndErrors: unknown[]) {
const outputId = data.outputId;
public async rerenderOutputCell(data: webviewMessages.ICreationRequestMessage, state: { cancelled: boolean }): Promise<void> {
const preloadsAndErrors = await Promise.all<unknown>([
data.rendererId ? renderers.load(data.rendererId) : undefined,
...data.requiredPreloads.map(p => kernelPreloads.waitFor(p.uri)),
].map(p => p?.catch(err => err)));
if (state.cancelled) {
return;
}
const cellOutput = this.ensureOutputCell(data.cellId, data.cellTop);
const outputNode = cellOutput.createOutputNode(outputId, data.outputOffset, data.left);
const outputNode = cellOutput.createOutputNode(data.outputId, data.outputOffset, data.left);
outputNode.render(data.content, preloadsAndErrors);
// don't hide until after this step so that the height is right