add NotebookDocumentContentCellChange#document, #145793

src/vs/workbench/api/common/extHost.protocol.ts

@@ -2040,7 +2040,7 @@ export type NotebookRawContentEventDto =
 	| notebookCommon.NotebookCellsChangeMetadataEvent
 	| notebookCommon.NotebookCellsChangeInternalMetadataEvent
 	// | notebookCommon.NotebookDocumentChangeMetadataEvent
-	// | notebookCommon.NotebookCellContentChangeEvent
+	| notebookCommon.NotebookCellContentChangeEvent
 	// | notebookCommon.NotebookDocumentUnknownChangeEvent
 	;
 

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

@@ -262,6 +262,11 @@ export class ExtHostNotebookDocument {
 
 			} else if (rawEvent.kind === notebookCommon.NotebookCellsChangeType.ChangeLanguage) {
 				this._changeCellLanguage(rawEvent.index, rawEvent.language);
+				relaxedCellChanges.push({ cell: this._cells[rawEvent.index].apiCell, document: this._cells[rawEvent.index].apiCell.document });
+
+			} else if (rawEvent.kind === notebookCommon.NotebookCellsChangeType.ChangeCellContent) {
+				relaxedCellChanges.push({ cell: this._cells[rawEvent.index].apiCell, document: this._cells[rawEvent.index].apiCell.document });
+
 			} else if (rawEvent.kind === notebookCommon.NotebookCellsChangeType.ChangeCellMime) {
 				this._changeCellMime(rawEvent.index, rawEvent.mime);
 			} else if (rawEvent.kind === notebookCommon.NotebookCellsChangeType.ChangeCellMetadata) {
@@ -282,6 +287,7 @@ export class ExtHostNotebookDocument {
 			const existing = map.get(relaxedCellChange.cell);
 			if (existing === undefined) {
 				const newLen = result.cellChanges.push({
+					document: undefined,
 					executionSummary: undefined,
 					metadata: undefined,
 					outputs: undefined,

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

@@ -459,10 +459,12 @@ suite('NotebookCell#Document', function () {
 		assert.deepStrictEqual(first.metadata, first.cell.metadata);
 		assert.deepStrictEqual(first.executionSummary, undefined);
 		assert.deepStrictEqual(first.outputs, undefined);
+		assert.deepStrictEqual(first.document, undefined);
 
 		assert.deepStrictEqual(second.outputs, second.cell.outputs);
 		assert.deepStrictEqual(second.metadata, second.cell.metadata);
 		assert.deepStrictEqual(second.executionSummary, undefined);
+		assert.deepStrictEqual(second.document, undefined);
 	});
 
 	test('onDidChangeNotebook-event, notebook metadata', async function () {
@@ -493,4 +495,64 @@ suite('NotebookCell#Document', function () {
 		assert.ok(Object.isFrozen(event.notebook));
 		assert.ok(!Object.isFrozen(event.metadata));
 	});
+
+	test('change cell language and onDidChangeNotebookDocument', async function () {
+
+		const p = Event.toPromise(extHostNotebookDocuments.onDidChangeNotebookDocument);
+
+		const first = notebook.apiNotebook.cellAt(0);
+		assert.strictEqual(first.document.languageId, 'markdown');
+
+		extHostNotebookDocuments.$acceptModelChanged(notebook.uri, new SerializableObjectWithBuffers({
+			versionId: 12,
+			rawEvents: [{
+				kind: NotebookCellsChangeType.ChangeLanguage,
+				index: 0,
+				language: 'fooLang'
+			}]
+		}), false);
+
+		const event = await p;
+
+		assert.strictEqual(event.notebook === notebook.apiNotebook, true);
+		assert.strictEqual(event.contentChanges.length, 0);
+		assert.strictEqual(event.cellChanges.length, 1);
+
+		const [cellChange] = event.cellChanges;
+
+		assert.strictEqual(cellChange.cell === first, true);
+		assert.ok(cellChange.document === first.document);
+		assert.ok(cellChange.executionSummary === undefined);
+		assert.ok(cellChange.metadata === undefined);
+		assert.ok(cellChange.outputs === undefined);
+	});
+
+	test('change notebook cell document and onDidChangeNotebookDocument', async function () {
+
+		const p = Event.toPromise(extHostNotebookDocuments.onDidChangeNotebookDocument);
+
+		const first = notebook.apiNotebook.cellAt(0);
+
+		extHostNotebookDocuments.$acceptModelChanged(notebook.uri, new SerializableObjectWithBuffers({
+			versionId: 12,
+			rawEvents: [{
+				kind: NotebookCellsChangeType.ChangeCellContent,
+				index: 0
+			}]
+		}), false);
+
+		const event = await p;
+
+		assert.strictEqual(event.notebook === notebook.apiNotebook, true);
+		assert.strictEqual(event.contentChanges.length, 0);
+		assert.strictEqual(event.cellChanges.length, 1);
+
+		const [cellChange] = event.cellChanges;
+
+		assert.strictEqual(cellChange.cell === first, true);
+		assert.ok(cellChange.document === first.document);
+		assert.ok(cellChange.executionSummary === undefined);
+		assert.ok(cellChange.metadata === undefined);
+		assert.ok(cellChange.outputs === undefined);
+	});
 });

src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts

@@ -315,7 +315,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
 		switch (e) {
 			case 'content':
 				this._pauseableEmitter.fire({
-					rawEvents: [{ kind: NotebookCellsChangeType.ChangeCellContent, transient: false }],
+					rawEvents: [{ kind: NotebookCellsChangeType.ChangeCellContent, index: this._getCellIndexByHandle(cell.handle), transient: false }],
 					versionId: this.versionId,
 					synchronous: true,
 					endSelectionState: undefined

src/vs/workbench/contrib/notebook/common/notebookCommon.ts

@@ -276,6 +276,7 @@ export interface NotebookCellsInitializeEvent<T> {
 
 export interface NotebookCellContentChangeEvent {
 	readonly kind: NotebookCellsChangeType.ChangeCellContent;
+	readonly index: number;
 }
 
 export interface NotebookCellsModelChangedEvent<T> {

src/vscode-dts/vscode.proposed.notebookDocumentEvents.d.ts

@@ -19,6 +19,14 @@ declare module 'vscode' {
 		 */
 		readonly cell: NotebookCell;
 
+		/**
+		 * The document of the cell or `undefined` when it did not change.
+		 *
+		 * *Note* that you should use the {@link workspace.onDidChangeTextDocument onDidChangeTextDocument}-event
+		 * for detailed change information, like what edits have been performed.
+		 */
+		readonly document: TextDocument | undefined;
+
 		/**
 		 * The new metadata of the cell or `undefined` when it did not change.
 		 */