From f7c3484438c4bf5bae95710201545656dcc3ec9e Mon Sep 17 00:00:00 2001
From: Arvind Ranasaria <ranasaria@outlook.com>
Date: Tue, 2 Jun 2020 15:21:34 -0700
Subject: [PATCH] Unique title for opened notebooks (#10673)

* removing debug log

* Ensure unique title for Nb launch

* pr feedback

* pr feedback

* pr fedback

* pr feedback
---
 .../resource-deployment/src/services/notebookService.ts      | 2 +-
 .../resource-deployment/src/services/platformService.ts      | 3 ++-
 .../src/ui/notebookWizard/notebookWizard.ts                  | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/resource-deployment/src/services/notebookService.ts b/extensions/resource-deployment/src/services/notebookService.ts
index 41b1d95422..9d32ceac2e 100644
--- a/extensions/resource-deployment/src/services/notebookService.ts
+++ b/extensions/resource-deployment/src/services/notebookService.ts
@@ -79,7 +79,7 @@ export class NotebookService implements INotebookService {
 	 * @param content the notebook content
 	 */
 	async launchNotebookWithContent(title: string, content: string): Promise<azdata.nb.NotebookEditor> {
-		const uri: vscode.Uri = vscode.Uri.parse(`untitled:${title}`);
+		const uri: vscode.Uri = vscode.Uri.parse(`untitled:${this.findNextUntitledEditorName(title)}`);
 		return await azdata.nb.showNotebookDocument(uri, {
 			connectionProfile: undefined,
 			preview: false,
diff --git a/extensions/resource-deployment/src/services/platformService.ts b/extensions/resource-deployment/src/services/platformService.ts
index 0bfd67d552..11b2c7970b 100644
--- a/extensions/resource-deployment/src/services/platformService.ts
+++ b/extensions/resource-deployment/src/services/platformService.ts
@@ -124,7 +124,8 @@ export class PlatformService implements IPlatformService {
 	}
 
 	isNotebookNameUsed(title: string): boolean {
-		return (azdata.nb.notebookDocuments.findIndex(doc => doc.isUntitled && doc.fileName === title) > -1);
+		return (azdata.nb.notebookDocuments.findIndex(doc => doc.isUntitled && doc.fileName === title) > -1)
+			&& (vscode.workspace.textDocuments.findIndex(doc => doc.isUntitled && doc.fileName === title) > -1);
 	}
 
 	async makeDirectory(path: string): Promise<void> {
diff --git a/extensions/resource-deployment/src/ui/notebookWizard/notebookWizard.ts b/extensions/resource-deployment/src/ui/notebookWizard/notebookWizard.ts
index c0d117135c..f4c5fd6755 100644
--- a/extensions/resource-deployment/src/ui/notebookWizard/notebookWizard.ts
+++ b/extensions/resource-deployment/src/ui/notebookWizard/notebookWizard.ts
@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { INotebookService, Notebook } from '../../services/notebookService';
@@ -91,8 +90,8 @@ export class NotebookWizard extends WizardBase<NotebookWizard, NotebookWizardPag
 				this.notebookService.backgroundExecuteNotebook(this.wizardInfo.taskName, notebook, 'deploy', this.platformService, env);
 			} else {
 				Object.assign(process.env, env);
-				const title = path.basename(this.notebookService.getNotebookPath(this.wizardInfo.notebook));
-				await this.notebookService.launchNotebookWithContent(title, JSON.stringify(notebook, undefined, 4));
+				const notebookPath = this.notebookService.getNotebookPath(this.wizardInfo.notebook);
+				await this.notebookService.launchNotebookWithContent(notebookPath, JSON.stringify(notebook, undefined, 4));
 			}
 		} catch (error) {
 			vscode.window.showErrorMessage(error);