slightly better uri for untitled notebooks, #121974

microsoft · May 19, 2021 · 9716c27 · 9716c27
1 parent 52c8fce
commit 9716c27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
@@ -119,12 +119,12 @@ export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsS
 		};
 	}
 
-	async $tryCreateNotebook(options: { viewType?: string, content?: NotebookDataDto }): Promise<UriComponents> {
+	async $tryCreateNotebook(options: { viewType: string, content?: NotebookDataDto }): Promise<UriComponents> {
 
 		// find a free URI for the untitled case
 		let uri: URI;
 		for (let counter = 1; ; counter++) {
-			let candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-Notebook-${counter}` });
+			let candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}`, query: options.viewType });
 			if (!this._notebookService.getNotebookTextModel(candidate)) {
 				uri = candidate;
 				break;

diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -888,7 +888,7 @@ export interface MainThreadNotebookEditorsShape extends IDisposable {
 }
 
 export interface MainThreadNotebookDocumentsShape extends IDisposable {
-	$tryCreateNotebook(options: { viewType?: string, content?: NotebookDataDto }): Promise<UriComponents>;
+	$tryCreateNotebook(options: { viewType: string, content?: NotebookDataDto }): Promise<UriComponents>;
 	$tryOpenNotebook(uriComponents: UriComponents): Promise<UriComponents>;
 	$trySaveNotebook(uri: UriComponents): Promise<boolean>;
 	$applyEdits(resource: UriComponents, edits: IImmediateCellEditOperation[], computeUndoRedo?: boolean): Promise<void>;

diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -254,7 +254,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
 		return new NotebookEditorDecorationType(this._notebookEditorsProxy, options).value;
 	}
 
-	async createNotebookDocument(options: { viewType?: string, content?: vscode.NotebookData } = {}): Promise<URI> {
+	async createNotebookDocument(options: { viewType: string, content?: vscode.NotebookData }): Promise<URI> {
 		const canonicalUri = await this._notebookDocumentsProxy.$tryCreateNotebook({
 			viewType: options.viewType,
 			content: options.content && typeConverters.NotebookData.from(options.content)