ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert #4955 to unblock integration test (#5016)

Browse Source
This commit is contained in:
Yurong He
2019-04-12 14:08:38 -07:00
committed by GitHub
parent 642f5d4405
commit 177b48c3f2
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts
View File

@@ -30,9 +30,6 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; 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'; import { notebookModeId } from 'sql/parts/common/customInputConverter';
class MainThreadNotebookEditor extends Disposable { class MainThreadNotebookEditor extends Disposable {
@@ -315,9 +312,7 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements
@IInstantiationService private _instantiationService: IInstantiationService, @IInstantiationService private _instantiationService: IInstantiationService,
@IEditorService private _editorService: IEditorService, @IEditorService private _editorService: IEditorService,
@IEditorGroupsService private _editorGroupService: IEditorGroupsService, @IEditorGroupsService private _editorGroupService: IEditorGroupsService,
@ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService
@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
@IObjectExplorerService private _objectExplorerService: IObjectExplorerService
) { ) {
super(); super();
if (extHostContext) { if (extHostContext) {
@@ -408,12 +403,7 @@ export class MainThreadNotebookDocumentsAndEditors extends Disposable implements
let input = this._instantiationService.createInstance(NotebookInput, path.basename(uri.fsPath), uri, fileInput); let input = this._instantiationService.createInstance(NotebookInput, path.basename(uri.fsPath), uri, fileInput);
input.isTrusted = isUntitled; input.isTrusted = isUntitled;
input.defaultKernel = options.defaultKernel; input.defaultKernel = options.defaultKernel;
if (options.connectionProfile) {
input.connectionProfile = new ConnectionProfile(this._capabilitiesService, 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);
}
if (isUntitled) { if (isUntitled) {
let untitledModel = await input.textInput.resolve(); let untitledModel = await input.textInput.resolve();
untitledModel.load(); untitledModel.load();