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

append when stream outputs are concatenated

Browse source
This commit is contained in:
Aaron Munger 2023-07-12 15:20:43 -07:00
parent 5b78562d6c
commit e68a34f9bd
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,12 +282,17 @@ function renderStream(outputInfo: OutputWithAppend, outputElement: HTMLElement,
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 newContent = createContent(outputInfo, ctx, outputScrolling, error);
const existingContent = previousOutputParent.querySelector(`[output-item-id="${outputInfo.id}"]`) as HTMLElement | null;
if (existingContent) {
existingContent.replaceWith(newContent);
if (appendedText && outputScrolling) {
appendScrollableOutput(existingContent, outputInfo.id, appendedText, outputInfo.text(), false);
}
else {
const newContent = createContent(outputInfo, ctx, outputScrolling, error);
existingContent.replaceWith(newContent);
}
} else {
const newContent = createContent(outputInfo, ctx, outputScrolling, error);
previousOutputParent.appendChild(newContent);
}
previousOutputParent.classList.toggle('scrollbar-visible', previousOutputParent.scrollHeight > previousOutputParent.clientHeight);

2
extensions/notebook-renderers/src/textHelper.ts
View file

@ -128,7 +128,7 @@ export function appendScrollableOutput(element: HTMLElement, id: string, appende
outputLengths[id] = Math.min(fullBuffer.length, softScrollableLineLimit);
const newElement = scrollableArrayOfString(id, fullBuffer.slice(-1 * softScrollableLineLimit), trustHtml);
newElement.setAttribute('output-item-id', id);
element.replaceWith();
element.replaceWith(newElement);
}
else {
element.appendChild(handleANSIOutput(buffer.join('\n'), trustHtml));