make sure "Open With..." actually works..., maybe #121974 or maybe #1…

…21904
microsoft · Apr 26, 2021 · 594b7b0 · 594b7b0
1 parent 2cfe0d7
commit 594b7b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -566,12 +566,13 @@ export class NotebookFileWorkingCopyModel implements IFileWorkingCopyModel {
 export class NotebookFileWorkingCopyModelFactory implements IFileWorkingCopyModelFactory<NotebookFileWorkingCopyModel>{
 
 	constructor(
-		@INotebookService private readonly _notebookService: INotebookService
+		private readonly _viewType: string,
+		@INotebookService private readonly _notebookService: INotebookService,
 	) { }
 
 	async createModel(resource: URI, stream: VSBufferReadableStream, token: CancellationToken): Promise<NotebookFileWorkingCopyModel> {
 
-		const info = await this._notebookService.withNotebookDataProvider(resource);
+		const info = await this._notebookService.withNotebookDataProvider(resource, this._viewType);
 		if (!(info instanceof SimpleNotebookProviderInfo)) {
 			throw new Error('CANNOT open file notebook with this provider');
 		}

diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
@@ -66,7 +66,7 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 				workingCopyManager = <IFileWorkingCopyManager<NotebookFileWorkingCopyModel>><any>this._instantiationService.createInstance(
 					FileWorkingCopyManager,
 					workingCopyTypeId,
-					new NotebookFileWorkingCopyModelFactory(this._notebookService)
+					new NotebookFileWorkingCopyModelFactory(viewType, this._notebookService)
 				);
 				this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
 			}