From 1fa03b5c74819bc743ca00569250b3142c567dad Mon Sep 17 00:00:00 2001 From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Date: Mon, 14 Jan 2019 16:38:57 -0800 Subject: [PATCH] Ensure we always get all providers (#3724) --- .../mainThreadNotebookDocumentsAndEditors.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index 8d51ad54be..6ef943bc29 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -321,16 +321,13 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements let model = new NotebookInputModel(uri, undefined, trusted, undefined); let providerId = options.providerId; let providers: string[] = undefined; - if (!providerId) - { - // Ensure there is always a sensible provider ID for this file type - providers = getProvidersForFileName(uri.fsPath, this._notebookService); - // Try to use a non-builtin provider first - if (providers) { - providerId = providers.find(p => p !== DEFAULT_NOTEBOOK_PROVIDER); - if (!providerId) { - providerId = model.providerId; - } + // Ensure there is always a sensible provider ID for this file type + providers = getProvidersForFileName(uri.fsPath, this._notebookService); + // Try to use a non-builtin provider first + if (providers) { + providerId = providers.find(p => p !== DEFAULT_NOTEBOOK_PROVIDER); + if (!providerId) { + providerId = model.providerId; } } model.providers = providers;