From 177b48c3f204365afe58082e677882f7f21f89f9 Mon Sep 17 00:00:00 2001 From: Yurong He <43652751+YurongHe@users.noreply.github.com> Date: Fri, 12 Apr 2019 14:08:38 -0700 Subject: [PATCH] Revert #4955 to unblock integration test (#5016) --- .../node/mainThreadNotebookDocumentsAndEditors.ts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index 41a1a04c2d..8ae96ee462 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -30,9 +30,6 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; -import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { getCurrentGlobalConnection } from 'sql/workbench/common/taskUtilities'; import { notebookModeId } from 'sql/parts/common/customInputConverter'; class MainThreadNotebookEditor extends Disposable { @@ -315,9 +312,7 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements @IInstantiationService private _instantiationService: IInstantiationService, @IEditorService private _editorService: IEditorService, @IEditorGroupsService private _editorGroupService: IEditorGroupsService, - @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, - @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @IObjectExplorerService private _objectExplorerService: IObjectExplorerService + @ICapabilitiesService private _capabilitiesService: ICapabilitiesService ) { super(); if (extHostContext) { @@ -408,12 +403,7 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements let input = this._instantiationService.createInstance(NotebookInput, path.basename(uri.fsPath), uri, fileInput); input.isTrusted = isUntitled; input.defaultKernel = options.defaultKernel; - if (options.connectionProfile) { - input.connectionProfile = new ConnectionProfile(this._capabilitiesService, options.connectionProfile); - } else { - let connectionProfile = getCurrentGlobalConnection(this._objectExplorerService, this._connectionManagementService, this._editorService); - input.connectionProfile = new ConnectionProfile(this._capabilitiesService, connectionProfile); - } + input.connectionProfile = new ConnectionProfile(this._capabilitiesService, options.connectionProfile); if (isUntitled) { let untitledModel = await input.textInput.resolve(); untitledModel.load();