Merge pull request microsoft#188998 from microsoft/aamunger/streamingOutput

amunger · web-flow · commit 67ce925589c1 · 2023-07-26T16:50:20.000-07:00
missed case of compression
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -1012,8 +1012,10 @@ export function compressOutputItemStreams(outputs: Uint8Array[]) {
 		}
 	}
 
-	const didCompression = compressStreamBuffer(buffers);
-	const data = formatStreamText(VSBuffer.concat(buffers.map(buffer => VSBuffer.wrap(buffer))));
+	let didCompression = compressStreamBuffer(buffers);
+	const concatenated = VSBuffer.concat(buffers.map(buffer => VSBuffer.wrap(buffer)));
+	const data = formatStreamText(concatenated);
+	didCompression = didCompression || data.byteLength !== concatenated.byteLength;
 	return { data, didCompression };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1012,8 +1012,10 @@ export function compressOutputItemStreams(outputs: Uint8Array[]) {`
`1012`	`1012`	`}`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`		`- const didCompression = compressStreamBuffer(buffers);`
`1016`		`- const data = formatStreamText(VSBuffer.concat(buffers.map(buffer => VSBuffer.wrap(buffer))));`
	`1015`	`+ let didCompression = compressStreamBuffer(buffers);`
	`1016`	`+ const concatenated = VSBuffer.concat(buffers.map(buffer => VSBuffer.wrap(buffer)));`
	`1017`	`+ const data = formatStreamText(concatenated);`
	`1018`	`+ didCompression = didCompression \|\| data.byteLength !== concatenated.byteLength;`
`1017`	`1019`	`return { data, didCompression };`
`1018`	`1020`	`}`
`1019`	`1021`