From 9db3f734138d8680cfe93ad66add68cd65fc28d6 Mon Sep 17 00:00:00 2001
From: Raj <44002319+rajmusuku@users.noreply.github.com>
Date: Tue, 15 Jan 2019 11:41:05 -0800
Subject: [PATCH] Notebook Doesn't Prompt for Save even when isDirty #3568
 (#3656)

This is temp fix until native save is implemented.
---
 src/sql/parts/notebook/notebookInput.ts | 39 ++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/sql/parts/notebook/notebookInput.ts b/src/sql/parts/notebook/notebookInput.ts
index 3b622fd50b..46e1b749d1 100644
--- a/src/sql/parts/notebook/notebookInput.ts
+++ b/src/sql/parts/notebook/notebookInput.ts
@@ -5,6 +5,7 @@
 
 'use strict';
 
+import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/editor';
@@ -13,7 +14,9 @@ import URI from 'vs/base/common/uri';
 import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import * as resources from 'vs/base/common/resources';
 
-import { INotebookService } from 'sql/services/notebook/notebookService';
+import { INotebookService, INotebookEditor } from 'sql/services/notebook/notebookService';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import Severity from 'vs/base/common/severity';
 
 export type ModeViewSaveHandler = (handle: number) => Thenable<boolean>;
 
@@ -94,7 +97,8 @@ export class NotebookInput extends EditorInput {
 
 	constructor(private _title: string,
 		private _model: NotebookInputModel,
-		@INotebookService private notebookService: INotebookService
+		@INotebookService private notebookService: INotebookService,
+		@IDialogService private dialogService: IDialogService
 	) {
 		super();
 		this._model.onDidChangeDirty(() => this._onDidChangeDirty.fire());
@@ -173,14 +177,41 @@ export class NotebookInput extends EditorInput {
 		// as we need to either integrate with textFileService (seems like this isn't viable)
 		// or register our own complimentary service that handles the lifecycle operations such
 		// as close all, auto save etc.
-		return TPromise.wrap(ConfirmResult.DONT_SAVE);
+		const message = nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", this.getTitle());
+		const buttons: string[] = [
+			nls.localize({ key: 'save', comment: ['&& denotes a mnemonic'] }, "&&Save"),
+			nls.localize({ key: 'dontSave', comment: ['&& denotes a mnemonic'] }, "Do&&n't Save"),
+			nls.localize('cancel', "Cancel")
+		];
+
+		return this.dialogService.show(Severity.Warning, message, buttons, {
+			cancelId: 2,
+			detail: nls.localize('saveChangesDetail', "Your changes will be lost if you don't save them.")
+		}).then(index => {
+			switch (index) {
+				case 0: return ConfirmResult.SAVE;
+				case 1: return ConfirmResult.DONT_SAVE;
+				default: return ConfirmResult.CANCEL;
+			}
+		});
 	}
 
 	/**
 	 * Saves the editor if it is dirty. Subclasses return a promise with a boolean indicating the success of the operation.
 	 */
 	save(): TPromise<boolean> {
-		return this._model.save();
+		let activeEditor: INotebookEditor;
+		for (const editor of this.notebookService.listNotebookEditors()) {
+			if(editor.isActive())
+			{
+				activeEditor = editor;
+			}
+		}
+		if(activeEditor)
+		{
+			return TPromise.wrap(activeEditor.save().then((val) => {return val;}));
+		}
+		return TPromise.wrap(false);
 	}
 
 	/**