change IOutputItemDto to use real bytes, add many dedicated dto-types for transporting output (which cannot be bytes), remove metadata2 from renderer

2026-04-26 11:38:51 +01:00 · 2021-06-10 11:18:46 +02:00
parent 1d7b2d4b48
commit d0cc52143b
28 changed files with 470 additions and 315 deletions
--- a/src/vs/workbench/api/browser/mainThreadNotebookDto.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDto.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as extHostProtocol from 'vs/workbench/api/common/extHost.protocol';
+import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
+import * as notebookCommon from 'vs/workbench/contrib/notebook/common/notebookCommon';
+
+export namespace NotebookDto {
+
+	export function toNotebookOutputItemDto(item: notebookCommon.IOutputItemDto): extHostProtocol.NotebookOutputItemDto {
+		return {
+			mime: item.mime,
+			valueBytes: Array.from(item.data)
+		};
+	}
+
+	export function toNotebookOutputDto(output: notebookCommon.IOutputDto): extHostProtocol.NotebookOutputDto {
+		return {
+			outputId: output.outputId,
+			metadata: output.metadata,
+			items: output.outputs.map(toNotebookOutputItemDto)
+		};
+	}
+
+	export function toNotebookCellDataDto(cell: notebookCommon.ICellDto2): extHostProtocol.NotebookCellDataDto {
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			source: cell.source,
+			outputs: cell.outputs.map(toNotebookOutputDto)
+		};
+	}
+
+	export function toNotebookDataDto(data: notebookCommon.NotebookData): extHostProtocol.NotebookDataDto {
+		return {
+			metadata: data.metadata,
+			cells: data.cells.map(toNotebookCellDataDto)
+		};
+	}
+
+	export function fromNotebookOutputItemDto(item: extHostProtocol.NotebookOutputItemDto): notebookCommon.IOutputItemDto {
+		return {
+			mime: item.mime,
+			data: new Uint8Array(item.valueBytes)
+		};
+	}
+
+	export function fromNotebookOutputDto(output: extHostProtocol.NotebookOutputDto): notebookCommon.IOutputDto {
+		return {
+			outputId: output.outputId,
+			metadata: output.metadata,
+			outputs: output.items.map(fromNotebookOutputItemDto)
+		};
+	}
+
+	export function fromNotebookCellDataDto(cell: extHostProtocol.NotebookCellDataDto): notebookCommon.ICellDto2 {
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			source: cell.source,
+			outputs: cell.outputs.map(fromNotebookOutputDto),
+			metadata: cell.metadata,
+			internalMetadata: cell.internalMetadata
+		};
+	}
+
+	export function fromNotebookDataDto(data: extHostProtocol.NotebookDataDto): notebookCommon.NotebookData {
+		return {
+			metadata: data.metadata,
+			cells: data.cells.map(fromNotebookCellDataDto)
+		};
+	}
+
+	export function toNotebookCellDto(cell: NotebookCellTextModel): extHostProtocol.NotebookCellDto {
+		return {
+			handle: cell.handle,
+			uri: cell.uri,
+			source: cell.textBuffer.getLinesContent(),
+			eol: cell.textBuffer.getEOL(),
+			language: cell.language,
+			cellKind: cell.cellKind,
+			outputs: cell.outputs.map(toNotebookOutputDto),
+			metadata: cell.metadata,
+			internalMetadata: cell.internalMetadata,
+		};
+	}
+
+	export function fromCellExecuteEditDto(data: extHostProtocol.CellExecuteEditDto): notebookCommon.IImmediateCellEditOperation {
+		if (data.editType === notebookCommon.CellEditType.PartialInternalMetadata) {
+			return data;
+		} else if (data.editType === notebookCommon.CellEditType.Output) {
+			return {
+				editType: data.editType,
+				handle: data.handle,
+				append: data.append,
+				outputs: data.outputs.map(fromNotebookOutputDto)
+			};
+		} else {
+			return {
+				editType: data.editType,
+				append: data.append,
+				outputId: data.outputId,
+				items: data.items.map(fromNotebookOutputItemDto)
+			};
+		}
+	}
+
+	export function fromCellEditOperationDto(edit: extHostProtocol.ICellEditOperationDto): notebookCommon.ICellEditOperation {
+		if (edit.editType === notebookCommon.CellEditType.Replace) {
+			return {
+				editType: edit.editType,
+				index: edit.index,
+				count: edit.count,
+				cells: edit.cells.map(fromNotebookCellDataDto)
+			};
+		} else {
+			return edit;
+		}
+	}
+}