Ensure execution_count is cleared when clearing outputs (#237301)

extensions/ipynb/src/deserializers.ts

@@ -149,8 +149,12 @@ function getNotebookCellMetadata(cell: nbformat.IBaseCell): {
 	// We put this only for VSC to display in diff view.
 	// Else we don't use this.
 	const cellMetadata: CellMetadata = {};
-	if (cell.cell_type === 'code' && typeof cell['execution_count'] === 'number') {
-		cellMetadata.execution_count = cell['execution_count'];
+	if (cell.cell_type === 'code') {
+		if (typeof cell['execution_count'] === 'number') {
+			cellMetadata.execution_count = cell['execution_count'];
+		} else {
+			cellMetadata.execution_count = null;
+		}
 	}
 
 	if (cell['metadata']) {

extensions/ipynb/src/notebookModelStoreSync.ts

@@ -165,6 +165,13 @@ function onDidChangeNotebookCells(e: NotebookDocumentChangeEventEx) {
 			metadata.execution_count = null;
 			metadataUpdated = true;
 			pendingCellUpdates.delete(e.cell);
+		} else if (!e.executionSummary?.executionOrder && !e.executionSummary?.success && !e.executionSummary?.timing
+			&& !e.metadata && !e.outputs && currentMetadata.execution_count && !pendingCellUpdates.has(e.cell)) {
+			// This is a result of the cell without outupts but has execution count being cleared
+			// Create two cells, one that produces output and one that doesn't. Run both and then clear the output or all cells.
+			// This condition will be satisfied for first cell without outputs.
+			metadata.execution_count = null;
+			metadataUpdated = true;
 		}
 
 		if (e.document?.languageId && e.document?.languageId !== preferredCellLanguage && e.document?.languageId !== languageIdInMetadata) {