notebook content change events.

src/vs/vscode.proposed.d.ts

@@ -1800,6 +1800,45 @@ declare module 'vscode' {
 		preloads?: Uri[];
 	}
 
+	export enum NotebookCellsChangeType {
+		ModelChange = 1,
+		MoveCell = 2,
+		ClearCellOutputs = 3,
+		ClearAllCellsOutputs = 4,
+		ChangeCellLanguage = 5
+	}
+
+	export interface NotebookCellsModelChangedEvent {
+		readonly kind: NotebookCellsChangeType.ModelChange;
+		readonly start: number;
+		readonly deletedCount: number;
+		readonly items: NotebookCell[];
+	}
+
+	export interface NotebookCellsModelMoveEvent {
+		readonly kind: NotebookCellsChangeType.MoveCell;
+		readonly index: number;
+		readonly newIndex: number;
+	}
+
+	export interface NotebookCellClearOutputEvent {
+		readonly kind: NotebookCellsChangeType.ClearCellOutputs;
+		readonly index: number;
+	}
+
+	export interface NotebookCellsClearOutputEvent {
+		readonly kind: NotebookCellsChangeType.ClearAllCellsOutputs;
+	}
+
+	export interface NotebookCellsChangeLanguageEvent {
+		readonly kind: NotebookCellsChangeType.ChangeCellLanguage;
+		readonly index: number;
+		readonly language: string;
+	}
+
+	export type NotebookContentChangeEvent = NotebookCellsModelChangedEvent | NotebookCellsModelMoveEvent | NotebookCellClearOutputEvent | NotebookCellsClearOutputEvent | NotebookCellsChangeLanguageEvent;
+
+
 	export interface NotebookDocumentChangeEvent {
 
 		/**
@@ -1810,7 +1849,7 @@ declare module 'vscode' {
 		/**
 		 * An array of content changes.
 		 */
-		// readonly contentChanges: ReadonlyArray<TextDocumentContentChangeEvent>;
+		readonly contentChanges: ReadonlyArray<NotebookContentChangeEvent>;
 	}
 
 	export interface NotebookCellData {

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

@@ -1083,6 +1083,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			CellKind: extHostTypes.CellKind,
 			CellOutputKind: extHostTypes.CellOutputKind,
 			NotebookCellRunState: extHostTypes.NotebookCellRunState,
+			NotebookCellsChangeType: extHostTypes.NotebookCellsChangeType,
 			AuthenticationSession2: extHostTypes.AuthenticationSession
 		};
 	};

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

@@ -14,7 +14,7 @@ import { CellKind, CellOutputKind, ExtHostNotebookShape, IMainContext, MainConte
 import { ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/common/extHostDocumentsAndEditors';
 import { CellEditType, CellUri, diff, ICellEditOperation, ICellInsertEdit, IErrorOutput, INotebookDisplayOrder, INotebookEditData, IOrderedMimeType, IStreamOutput, ITransformedDisplayOutputDto, mimeTypeSupportedByCore, NotebookCellsChangedEvent, NotebookCellsSplice2, sortMimeTypes, ICellDeleteEdit, notebookDocumentMetadataDefaults, NotebookCellsChangeType, NotebookDataDto } from 'vs/workbench/contrib/notebook/common/notebookCommon';
-import { Disposable as VSCodeDisposable } from './extHostTypes';
+import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtHostDocumentData } from 'vs/workbench/api/common/extHostDocumentData';
 import { NotImplementedProxy } from 'vs/base/common/types';
@@ -251,31 +251,35 @@ export class ExtHostNotebookDocument extends Disposable implements vscode.Notebo
 
 	get isDirty() { return false; }
 
-	accpetModelChanged(event: NotebookCellsChangedEvent) {
+	accpetModelChanged(event: NotebookCellsChangedEvent): vscode.NotebookContentChangeEvent[] {
+		let modelEvents: vscode.NotebookContentChangeEvent[] = [];
 		if (event.kind === NotebookCellsChangeType.ModelChange) {
-			this.$spliceNotebookCells(event.changes);
+			modelEvents = this.$spliceNotebookCells(event.changes);
 		} else if (event.kind === NotebookCellsChangeType.Move) {
-			this.$moveCell(event.index, event.newIdx);
+			modelEvents = this.$moveCell(event.index, event.newIdx);
 		} else if (event.kind === NotebookCellsChangeType.CellClearOutput) {
-			this.$clearCellOutputs(event.index);
+			modelEvents = this.$clearCellOutputs(event.index);
 		} else if (event.kind === NotebookCellsChangeType.CellsClearOutput) {
-			this.$clearAllCellOutputs();
+			modelEvents = this.$clearAllCellOutputs();
 		} else if (event.kind === NotebookCellsChangeType.ChangeLanguage) {
-			this.$changeCellLanguage(event.index, event.language);
+			modelEvents = this.$changeCellLanguage(event.index, event.language);
 		}
 
 		this._versionId = event.versionId;
+		return modelEvents;
 	}
 
-	private $spliceNotebookCells(splices: NotebookCellsSplice2[]): void {
+	private $spliceNotebookCells(splices: NotebookCellsSplice2[]): vscode.NotebookContentChangeEvent[] {
 		if (this._disposed) {
-			return;
+			return [];
 		}
 
 		if (!splices.length) {
-			return;
+			return [];
 		}
 
+		let contentChangeEvents: vscode.NotebookCellsModelChangedEvent[] = [];
+
 		splices.reverse().forEach(splice => {
 			let cellDtos = splice[2];
 			let newCells = cellDtos.map(cell => {
@@ -306,26 +310,55 @@ export class ExtHostNotebookDocument extends Disposable implements vscode.Notebo
 			}
 
 			this.cells.splice(splice[0], splice[1], ...newCells);
+			contentChangeEvents.push({
+				kind: extHostTypes.NotebookCellsChangeType.ModelChange,
+				start: splice[0],
+				deletedCount: splice[1],
+				items: newCells
+			});
 		});
+
+		return contentChangeEvents;
 	}
 
-	private $moveCell(index: number, newIdx: number) {
+	private $moveCell(index: number, newIdx: number): vscode.NotebookContentChangeEvent[] {
 		const cells = this.cells.splice(index, 1);
 		this.cells.splice(newIdx, 0, ...cells);
+
+		return [{
+			kind: extHostTypes.NotebookCellsChangeType.MoveCell,
+			index,
+			newIndex: newIdx
+		}];
 	}
 
-	private $clearCellOutputs(index: number) {
+	private $clearCellOutputs(index: number): vscode.NotebookContentChangeEvent[] {
 		const cell = this.cells[index];
 		cell.outputs = [];
+
+		return [{
+			kind: extHostTypes.NotebookCellsChangeType.ClearCellOutputs,
+			index
+		}];
 	}
 
-	private $clearAllCellOutputs() {
+	private $clearAllCellOutputs(): vscode.NotebookContentChangeEvent[] {
 		this.cells.forEach(cell => cell.outputs = []);
+
+		return [{
+			kind: extHostTypes.NotebookCellsChangeType.ClearAllCellsOutputs,
+		}];
 	}
 
-	private $changeCellLanguage(index: number, language: string) {
+	private $changeCellLanguage(index: number, language: string): vscode.NotebookContentChangeEvent[] {
 		const cell = this.cells[index];
 		cell.language = language;
+
+		return [{
+			kind: extHostTypes.NotebookCellsChangeType.ChangeCellLanguage,
+			index,
+			language
+		}];
 	}
 
 	eventuallyUpdateCellOutputs(cell: ExtHostCell, diffs: ISplice<vscode.CellOutput>[]) {
@@ -641,8 +674,8 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 	private readonly _editors = new Map<string, { editor: ExtHostNotebookEditor, onDidReceiveMessage: Emitter<any>; }>();
 	private readonly _notebookOutputRenderers = new Map<number, ExtHostNotebookOutputRenderer>();
 
-	private readonly _onDidChangeNotebookDocument = new Emitter<{ document: ExtHostNotebookDocument, changes: NotebookCellsChangedEvent[]; }>();
-	readonly onDidChangeNotebookDocument: Event<{ document: ExtHostNotebookDocument, changes: NotebookCellsChangedEvent[]; }> = this._onDidChangeNotebookDocument.event;
+	private readonly _onDidChangeNotebookDocument = new Emitter<vscode.NotebookDocumentChangeEvent>();
+	readonly onDidChangeNotebookDocument: Event<vscode.NotebookDocumentChangeEvent> = this._onDidChangeNotebookDocument.event;
 
 	private _outputDisplayOrder: INotebookDisplayOrder | undefined;
 
@@ -702,7 +735,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		let extHostRenderer = new ExtHostNotebookOutputRenderer(type, filter, renderer);
 		this._notebookOutputRenderers.set(extHostRenderer.handle, extHostRenderer);
 		this._proxy.$registerNotebookRenderer({ id: extension.identifier, location: extension.extensionLocation }, type, filter, extHostRenderer.handle, renderer.preloads || []);
-		return new VSCodeDisposable(() => {
+		return new extHostTypes.Disposable(() => {
 			this._notebookOutputRenderers.delete(extHostRenderer.handle);
 			this._proxy.$unregisterNotebookRenderer(extHostRenderer.handle);
 		});
@@ -731,7 +764,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 
 		this._notebookContentProviders.set(viewType, { extension, provider });
 		this._proxy.$registerNotebookProvider({ id: extension.identifier, location: extension.extensionLocation }, viewType, provider.kernel ? { id: viewType, label: provider.kernel.label, extensionLocation: extension.extensionLocation, preloads: provider.kernel.preloads } : undefined);
-		return new VSCodeDisposable(() => {
+		return new extHostTypes.Disposable(() => {
 			this._notebookContentProviders.delete(viewType);
 			this._proxy.$unregisterNotebookProvider(viewType);
 		});
@@ -746,7 +779,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		const transformedSelectors = selectors.map(selector => typeConverters.GlobPattern.from(selector));
 
 		this._proxy.$registerNotebookKernel({ id: extension.identifier, location: extension.extensionLocation }, id, kernel.label, transformedSelectors, kernel.preloads || []);
-		return new VSCodeDisposable(() => {
+		return new extHostTypes.Disposable(() => {
 			this._notebookKernels.delete(id);
 			this._proxy.$unregisterNotebookKernel(id);
 		});
@@ -966,10 +999,10 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		const document = this._documents.get(URI.revive(uriComponents).toString());
 
 		if (document) {
-			document.accpetModelChanged(event);
+			const appliedEvents = document.accpetModelChanged(event);
 			this._onDidChangeNotebookDocument.fire({
 				document: document,
-				changes: [event]
+				contentChanges: appliedEvents
 			});
 		}
 	}

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

@@ -2732,6 +2732,14 @@ export enum NotebookCellRunState {
 	Error = 4
 }
 
+export enum NotebookCellsChangeType {
+	ModelChange = 1,
+	MoveCell = 2,
+	ClearCellOutputs = 3,
+	ClearAllCellsOutputs = 4,
+	ChangeCellLanguage = 5
+}
+
 //#endregion
 
 //#region Timeline