development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

select previous output to be replaced correctly

Browse source
This commit is contained in:
aamunger 2023-06-08 21:51:18 -07:00
parent db6bcdf309
commit 3767249655
No known key found for this signature in database
GPG key ID: F2CA0C6303FC6B74
2 changed files with 50 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/notebook-renderers/src/index.ts
View file

@ -285,11 +285,10 @@ function renderStream(outputInfo: OutputItem, outputElement: HTMLElement, error:
const scrollTop = outputScrolling ? findScrolledHeight(outputElement) : undefined;
const existingContent = outputElement.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null;
const previousOutputParent = getPreviousMatchingContentGroup(outputElement);
// If the previous output item for the same cell was also a stream, append this output to the previous
if (previousOutputParent) {
const existingContent = previousOutputParent.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null;
if (existingContent) {
existingContent.replaceWith(newContent);
@ -299,6 +298,7 @@ function renderStream(outputInfo: OutputItem, outputElement: HTMLElement, error:
previousOutputParent.classList.toggle('scrollbar-visible', previousOutputParent.scrollHeight > previousOutputParent.clientHeight);
previousOutputParent.scrollTop = scrollTop !== undefined ? scrollTop : previousOutputParent.scrollHeight;
} else {
const existingContent = outputElement.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null;
let contentParent = existingContent?.parentElement;
if (existingContent && contentParent) {
existingContent.replaceWith(newContent);

48
extensions/notebook-renderers/src/test/notebookRenderer.test.ts
View file

@ -98,6 +98,10 @@ suite('Notebook builtin output renderer', () => {
this.firstOutput = outputElement;
}
public get cellElement() {
return this.cell;
}
public getFirstOuputElement() {
return this.firstOutput;
}
@ -241,6 +245,50 @@ suite('Notebook builtin output renderer', () => {
assert.ok(inserted.innerHTML.indexOf('>third stream content</') > -1, `Content was not added to output element: ${outputElement.innerHTML}`);
});
test(`Consolidated streaming outputs should replace matching outputs correctly`, async () => {
const context = createContext({ outputScrolling: false });
const renderer = await activate(context);
assert.ok(renderer, 'Renderer not created');
const outputHtml = new OutputHtml();
const outputElement = outputHtml.getFirstOuputElement();
const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1');
const outputItem2 = createOutputItem('second stream content', stdoutMimeType, '2');
await renderer!.renderOutputItem(outputItem1, outputElement);
const secondOutput = outputHtml.appendOutputElement();
await renderer!.renderOutputItem(outputItem2, secondOutput);
const newOutputItem1 = createOutputItem('replaced content', stdoutMimeType, '2');
await renderer!.renderOutputItem(newOutputItem1, secondOutput);
const inserted = outputElement.firstChild as HTMLElement;
assert.ok(inserted, `nothing appended to output element: ${outputElement.innerHTML}`);
assert.ok(inserted.innerHTML.indexOf('>first stream content</') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`);
assert.ok(inserted.innerHTML.indexOf('>replaced content</') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`);
assert.ok(inserted.innerHTML.indexOf('>second stream content</') === -1, `Content was not replaced in output element: ${outputHtml.cellElement.innerHTML}`);
});
test(`Streaming outputs interleaved with other mime types will produce separate outputs`, async () => {
const context = createContext({ outputScrolling: false });
const renderer = await activate(context);
assert.ok(renderer, 'Renderer not created');
const outputHtml = new OutputHtml();
const firstOutputElement = outputHtml.getFirstOuputElement();
const outputItem1 = createOutputItem('first stream content', stdoutMimeType, '1');
const outputItem2 = createOutputItem(JSON.stringify(error), errorMimeType, '2');
const outputItem3 = createOutputItem('second stream content', stdoutMimeType, '3');
await renderer!.renderOutputItem(outputItem1, firstOutputElement);
const secondOutputElement = outputHtml.appendOutputElement();
await renderer!.renderOutputItem(outputItem2, secondOutputElement);
const thirdOutputElement = outputHtml.appendOutputElement();
await renderer!.renderOutputItem(outputItem3, thirdOutputElement);
assert.ok(firstOutputElement.innerHTML.indexOf('>first stream content</') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`);
assert.ok(secondOutputElement.innerHTML.indexOf('>NameError</') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`);
assert.ok(thirdOutputElement.innerHTML.indexOf('>second stream content</') > -1, `Content was not added to output element: ${outputHtml.cellElement.innerHTML}`);
});
test(`Multiple adjacent streaming outputs, rerendering the first should erase the rest`, async () => {
const context = createContext();
const renderer = await activate(context);