Merge pull request #125728 from microsoft/joh/fix/125716

make sure to transform notebook data metadata

Author: jrieken

src/vs/workbench/api/common/extHostTypeConverters.ts

@@ -1460,7 +1460,7 @@ export namespace NotebookData {
 
 	export function from(data: vscode.NotebookData): notebooks.NotebookDataDto {
 		const res: notebooks.NotebookDataDto = {
-			metadata: Object.create(null),
+			metadata: data.metadata ?? Object.create(null),
 			cells: [],
 		};
 		for (let cell of data.cells) {

src/vs/workbench/test/browser/api/extHostTypeConverter.test.ts

@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { MarkdownString, NotebookCellOutputItem } from 'vs/workbench/api/common/extHostTypeConverters';
+import { MarkdownString, NotebookCellOutputItem, NotebookData } from 'vs/workbench/api/common/extHostTypeConverters';
 import { isEmptyObject } from 'vs/base/common/types';
 import { forEach } from 'vs/base/common/collections';
 import { LogLevel as _MainLogLevel } from 'vs/platform/log/common/log';
@@ -83,6 +83,20 @@ suite('ExtHostTypeConverter', function () {
 		});
 	});
 
+	test('Notebook metadata is ignored when using Notebook Serializer #125716', function () {
+
+		const d = new extHostTypes.NotebookData([]);
+		d.cells.push(new extHostTypes.NotebookCellData(extHostTypes.NotebookCellKind.Code, 'hello', 'fooLang'));
+		d.metadata = { custom: { foo: 'bar', bar: 123 } };
+
+		const dto = NotebookData.from(d);
+
+		assert.strictEqual(dto.cells.length, 1);
+		assert.strictEqual(dto.cells[0].language, 'fooLang');
+		assert.strictEqual(dto.cells[0].source, 'hello');
+		assert.deepStrictEqual(dto.metadata, d.metadata);
+	});
+
 	test('NotebookCellOutputItem', function () {
 
 		const item = extHostTypes.NotebookCellOutputItem.text('Hello', 'foo/bar');