From 25b1d4b6731a00e9dfdfcad0a91749f78d48e7e8 Mon Sep 17 00:00:00 2001 From: Raj <44002319+rajmusuku@users.noreply.github.com> Date: Sun, 17 Mar 2019 08:03:43 -0700 Subject: [PATCH] #4565: Open notebook from Dashboard - can't close dirty notebook (#4568) * #4565:"Don't save" doesn't close editor -Dashboard * Misc change --- .../api/node/mainThreadNotebookDocumentsAndEditors.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index fba25fa675..7eff11a4ce 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -32,7 +32,6 @@ import { NotebookChangeType, CellTypes } from 'sql/parts/notebook/models/contrac import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { notebookModeId } from 'sql/common/constants'; -import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; class MainThreadNotebookEditor extends Disposable { private _contentChangedEmitter = new Emitter(); @@ -371,7 +370,8 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements }; let isUntitled: boolean = uri.scheme === Schemas.untitled; - const fileInput: UntitledEditorInput = isUntitled ? this._untitledEditorService.createOrGet(uri, notebookModeId) : undefined; + const fileInput = isUntitled ? this._untitledEditorService.createOrGet(uri, notebookModeId) : + this._editorService.createInput({resource: uri, language: notebookModeId}); let input = this._instantiationService.createInstance(NotebookInput, path.basename(uri.fsPath), uri, fileInput); input.isTrusted = isUntitled; input.defaultKernel = options.defaultKernel;