fix conflict demo

Michael Lively · Michael Lively · commit 614c7dd5f450 · 2022-08-24T10:37:37.000-07:00
diff --git a/extensions/ipynb/src/notebookImagePaste.ts b/extensions/ipynb/src/notebookImagePaste.ts
@@ -124,7 +124,7 @@ function encodeBase64(buffer: Uint8Array, padded = true, urlSafe = false) {
 }
 
 function buildMetadata(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { [key: string]: any } {
-	const outputMetadata = {};
+	const outputMetadata = { ...cell.metadata };
 
 	if (!outputMetadata.custom) {
 		outputMetadata['custom'] = { 'attachments': { [filename]: { 'image/png': b64 } } };

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ function encodeBase64(buffer: Uint8Array, padded = true, urlSafe = false) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`function buildMetadata(b64: string, cell: vscode.NotebookCell, filename: string, filetype: string, startingAttachments: any): { [key: string]: any } {`
`127`		`- const outputMetadata = {};`
	`127`	`+ const outputMetadata = { ...cell.metadata };`
`128`	`128`
`129`	`129`	`if (!outputMetadata.custom) {`
`130`	`130`	`outputMetadata['custom'] = { 'attachments': { [filename]: { 'image/png': b64 } } };`