From ba0ba093845f4445392dd6effe2b0f5f82401aaa Mon Sep 17 00:00:00 2001
From: rebornix <penn.lv@gmail.com>
Date: Tue, 5 May 2020 09:53:53 -0700
Subject: [PATCH] naming: *Notebook

---
 src/vs/vscode.proposed.d.ts                   | 19 ++++++++++++++-----
 .../workbench/api/common/extHostNotebook.ts   |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index c8e02a8865e..1aeee093e26 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -1786,13 +1786,16 @@ declare module 'vscode' {
 	}
 
 	export interface NotebookContentProvider {
-		open(uri: Uri): NotebookData | Promise<NotebookData>;
-		save(document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
-		saveAs(targetResource: Uri, document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
-		readonly onDidChange: Event<void>;
+		openNotebook(uri: Uri): NotebookData | Promise<NotebookData>;
+		saveNotebook(document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
+		saveNotebookAs(targetResource: Uri, document: NotebookDocument, cancellation: CancellationToken): Promise<void>;
+		readonly onDidChangeNotebook: Event<void>;
 		// revert?(document: NotebookDocument, cancellation: CancellationToken): Thenable<void>;
 		// backup?(document: NotebookDocument, cancellation: CancellationToken): Thenable<CustomDocumentBackup>;
 
+		/**
+		 * Responsible for filling in outputs for the cell
+		 */
 		executeCell(document: NotebookDocument, cell: NotebookCell | undefined, token: CancellationToken): Promise<void>;
 	}
 
@@ -1807,8 +1810,14 @@ declare module 'vscode' {
 			provider: NotebookProvider
 		): Disposable;
 
-		export function registerNotebookOutputRenderer(type: string, outputSelector: NotebookOutputSelector, renderer: NotebookOutputRenderer): Disposable;
+		export function registerNotebookOutputRenderer(
+			type: string,
+			outputSelector: NotebookOutputSelector,
+			renderer: NotebookOutputRenderer
+		): Disposable;
+
 		export const onDidOpenNotebookDocument: Event<NotebookDocument>;
+		// export const onDidChangeVisibleNotebookEditors: Event<NotebookEditor[]>;
 
 		// remove activeNotebookDocument, now that there is activeNotebookEditor.document
 		export let activeNotebookDocument: NotebookDocument | undefined;
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index fdf8f728f6d..1df7a12584b 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -770,7 +770,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 
 			this._editors.set(revivedUri.toString(), { editor, onDidReceiveMessage });
 
-			const data = await provider.provider.open(revivedUri);
+			const data = await provider.provider.openNotebook(revivedUri);
 			editor.document.languages = data.languages;
 			editor.document.metadata = {
 				...notebookDocumentMetadataDefaults,
@@ -864,7 +864,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 
 		if (this._notebookContentProviders.has(viewType)) {
 			try {
-				await this._notebookContentProviders.get(viewType)!.provider.save(document, token);
+				await this._notebookContentProviders.get(viewType)!.provider.saveNotebook(document, token);
 			} catch (e) {
 				return false;
 			}