Initial Code Layering (#3788)

* working on formatting

* fixed basic lint errors; starting moving things to their appropriate location

* formatting

* update tslint to match the version of vscode we have

* remove unused code

* work in progress fixing layering

* formatting

* moved connection management service to platform

* formatting

* add missing file

* moving more servies

* formatting

* moving more services

* formatting

* wip

* moving more services

* formatting

* revert back tslint rules

* move css file

* add missing svgs

src/sql/parts/notebook/cellViews/code.component.ts

@@ -7,7 +7,7 @@ import 'vs/css!./code';
 import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, Output, EventEmitter, OnChanges, SimpleChange } from '@angular/core';
 
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor';
 import { CellToggleMoreActions } from 'sql/parts/notebook/cellToggleMoreActions';
 import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';

src/sql/parts/notebook/cellViews/interfaces.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OnDestroy } from '@angular/core';
-import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { AngularDisposable } from 'sql/base/node/lifecycle';
 
 export abstract class CellView extends AngularDisposable implements OnDestroy {
 	constructor() {

src/sql/parts/notebook/cellViews/output.component.ts

@@ -4,12 +4,12 @@
 *--------------------------------------------------------------------------------------------*/
 import 'vs/css!./code';
 
-import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core';
-import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { OnInit, Component, Input, Inject, ElementRef, ViewChild } from '@angular/core';
+import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { nb } from 'sqlops';
-import { INotebookService } from 'sql/services/notebook/notebookService';
+import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 import { MimeModel } from 'sql/parts/notebook/outputs/common/mimemodel';
-import * as outputProcessor from '../outputs/common/outputProcessor';
+import * as outputProcessor from 'sql/parts/notebook/outputs/common/outputProcessor';
 import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry';
 import 'vs/css!sql/parts/notebook/outputs/style/index';
 

src/sql/parts/notebook/cellViews/outputArea.component.ts

@@ -5,7 +5,7 @@
 import 'vs/css!./code';
 import 'vs/css!./outputArea';
 import { OnInit, Component, Input, Inject, ElementRef, ViewChild, forwardRef, ChangeDetectorRef } from '@angular/core';
-import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
 import * as themeColors from 'vs/workbench/common/theme';
 import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';

src/sql/parts/notebook/models/clientSession.ts

@@ -18,8 +18,8 @@ import { Deferred } from 'sql/base/common/promise';
 
 import * as notebookUtils from '../notebookUtils';
 import * as sparkUtils from '../spark/sparkUtils';
-import { INotebookManager } from 'sql/services/notebook/notebookService';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection';
 
 /**
@@ -266,7 +266,7 @@ export class ClientSession implements IClientSession {
 
 			let server = URI.parse(sparkUtils.getLivyUrl(this._connection.host, this._connection.knoxport)).toString();
 			let doNotCallChangeEndpointParams =
-			`%_do_not_call_change_endpoint --username=${this._connection.user} --password=${this._connection.password} --server=${server} --auth=Basic_Access`;
+				`%_do_not_call_change_endpoint --username=${this._connection.user} --password=${this._connection.password} --server=${server} --auth=Basic_Access`;
 			let future = this._session.kernel.requestExecute({
 				code: doNotCallChangeEndpointParams
 			}, true);

src/sql/parts/notebook/models/modelInterfaces.ts

@@ -15,10 +15,10 @@ import URI from 'vs/base/common/uri';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
 import { CellType, NotebookChangeType } from 'sql/parts/notebook/models/contracts';
-import { INotebookManager } from 'sql/services/notebook/notebookService';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection';
-import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 export interface IClientSessionOptions {

src/sql/parts/notebook/models/notebookConnection.ts

@@ -8,7 +8,7 @@
 
 import { localize } from 'vs/nls';
 
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
 export namespace constants {
 	export const hostPropName = 'host';

src/sql/parts/notebook/models/notebookModel.ts

@@ -13,12 +13,12 @@ import { Disposable } from 'vs/base/common/lifecycle';
 
 import { CellModel } from './cell';
 import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, notebookConstants, NotebookContentChange } from './modelInterfaces';
-import { NotebookChangeType, CellTypes, CellType } from 'sql/parts/notebook/models/contracts';
+import { NotebookChangeType, CellType } from 'sql/parts/notebook/models/contracts';
 import { nbversion } from '../notebookConstants';
 import * as notebookUtils from '../notebookUtils';
-import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService';
+import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
 import { SparkMagicContexts } from 'sql/parts/notebook/models/sparkMagicContexts';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection';
 import { INotification, Severity } from 'vs/platform/notification/common/notification';
 import { Schemas } from 'vs/base/common/network';
@@ -88,10 +88,10 @@ export class NotebookModel extends Disposable implements INotebookModel {
 		return this.notebookManagers.find(manager => manager.providerId === this._providerId);
 	}
 
-	public get notebookUri() : URI {
+	public get notebookUri(): URI {
 		return this.notebookOptions.notebookUri;
 	}
-	public set notebookUri(value : URI) {
+	public set notebookUri(value: URI) {
 		this.notebookOptions.notebookUri = value;
 	}
 

src/sql/parts/notebook/models/sparkMagicContexts.ts

@@ -10,11 +10,11 @@ import { nb } from 'sqlops';
 
 import * as pfs from 'vs/base/node/pfs';
 import { localize } from 'vs/nls';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IDefaultConnection, notebookConstants, INotebookModelOptions } from 'sql/parts/notebook/models/modelInterfaces';
 import * as notebookUtils from '../notebookUtils';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 
 const configBase = {
 	'kernel_python_credentials': {
@@ -155,7 +155,7 @@ export class SparkMagicContexts {
 
 		// Default to localhost in config file.
 		let creds: ICredentials = {
-		    'url': 'http://localhost:8088'
+			'url': 'http://localhost:8088'
 		};
 
 		let config: ISparkMagicConfig = Object.assign({}, configBase);

src/sql/parts/notebook/notebook.component.ts

@@ -3,7 +3,7 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import './notebookStyles';
+import 'sql/parts/notebook/notebookStyles';
 
 import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnDestroy } from '@angular/core';
 
@@ -30,17 +30,17 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
 
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts';
 import { ICellModel, IModelFactory, notebookConstants, INotebookModel, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces';
-import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement';
-import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService';
+import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement';
+import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
 import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
 import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
 import { ModelFactory } from 'sql/parts/notebook/models/modelFactory';
 import * as notebookUtils from 'sql/parts/notebook/notebookUtils';
 import { Deferred } from 'sql/base/common/promise';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, SaveNotebookAction } from 'sql/parts/notebook/notebookActions';
 import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService';
@@ -137,7 +137,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	public get activeCellId(): string {
-		return this._model && this._model.activeCell ? this._model.activeCell.id :  '';
+		return this._model && this._model.activeCell ? this._model.activeCell.id : '';
 	}
 
 	public get modelRegistered(): Promise<NotebookModel> {
@@ -175,15 +175,13 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	// Add cell based on cell type
-	public addCell(cellType: CellType)
-	{
+	public addCell(cellType: CellType) {
 		let newCell = this._model.addCell(cellType);
 		this.selectCell(newCell);
 	}
 
 	// Updates Notebook model's trust details
-	public updateModelTrustDetails(isTrusted: boolean)
-	{
+	public updateModelTrustDetails(isTrusted: boolean) {
 		this._model.trustedMode = isTrusted;
 		this._model.cells.forEach(cell => {
 			cell.trustedMode = isTrusted;
@@ -258,7 +256,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		await this.notebookService.registrationComplete;
 		// Refresh the provider if we had been using default
 		if (DEFAULT_NOTEBOOK_PROVIDER === this._notebookParams.providerId) {
-			let providers= notebookUtils.getProvidersForFileName(this._notebookParams.notebookUri.fsPath, this.notebookService);
+			let providers = notebookUtils.getProvidersForFileName(this._notebookParams.notebookUri.fsPath, this.notebookService);
 			let tsqlProvider = providers.find(provider => provider === SQL_NOTEBOOK_PROVIDER);
 			this._notebookParams.providerId = tsqlProvider ? SQL_NOTEBOOK_PROVIDER : providers[0];
 		}
@@ -284,10 +282,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	// Updates toolbar components
-	private updateToolbarComponents(isTrusted: boolean)
-	{
-		if(this._trustedAction)
-		{
+	private updateToolbarComponents(isTrusted: boolean) {
+		if (this._trustedAction) {
 			this._trustedAction.enabled = true;
 			this._trustedAction.trusted = isTrusted;
 		}
@@ -336,7 +332,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		let addCodeCellButton = new AddCellAction('notebook.AddCodeCell', localize('code', 'Code'), 'notebook-button icon-add');
 		addCodeCellButton.cellType = CellTypes.Code;
 
-		let addTextCellButton = new AddCellAction('notebook.AddTextCell',localize('text', 'Text'), 'notebook-button icon-add');
+		let addTextCellButton = new AddCellAction('notebook.AddTextCell', localize('text', 'Text'), 'notebook-button icon-add');
 		addTextCellButton.cellType = CellTypes.Markdown;
 
 		this._trustedAction = this.instantiationService.createInstance(TrustedAction, 'notebook.Trusted');
@@ -353,10 +349,10 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		let groups = notebookBarMenu.getActions({ arg: null, shouldForwardArgs: true });
 		let primary: IAction[] = [];
 		let secondary: IAction[] = [];
-		fillInActions(groups, {primary, secondary}, false, (group: string) => group === undefined);
+		fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined);
 
 		let taskbar = <HTMLElement>this.toolbar.nativeElement;
-		this._actionBar = new Taskbar(taskbar, this.contextMenuService, { actionItemProvider: action => this.actionItemProvider(action as Action)});
+		this._actionBar = new Taskbar(taskbar, this.contextMenuService, { actionItemProvider: action => this.actionItemProvider(action as Action) });
 		this._actionBar.context = this;
 		this._actionBar.setContent([
 			{ element: kernelContainer },
@@ -393,8 +389,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	promptForPath(defaultPath: string): TPromise<string> {
 		return this.windowService.showSaveDialog({
 			defaultPath: defaultPath,
-			filters: [{ name: localize('notebookFile', 'Notebook'), extensions: ['ipynb']}]
-		 });
+			filters: [{ name: localize('notebookFile', 'Notebook'), extensions: ['ipynb'] }]
+		});
 	}
 
 	// Entry point to save notebook
@@ -409,12 +405,11 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 					let resource = self._model.notebookUri;
 					self._model.notebookUri = target;
 					this.saveNotebook().then(result => {
-						if(result)
-						{
+						if (result) {
 							return this.replaceUntitledNotebookEditor(resource, target);
 						}
 						return result;
-					 });
+					});
 				}
 				return false; // User clicks cancel
 			});
@@ -459,7 +454,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	private setDirty(isDirty: boolean): void {
-		if(this._notebookParams.input){
+		if (this._notebookParams.input) {
 			this._notebookParams.input.setDirty(isDirty);
 		}
 	}

src/sql/parts/notebook/notebookActions.ts

@@ -15,10 +15,10 @@ import { SelectBox, ISelectBoxOptionsWithLabel } from 'sql/base/browser/ui/selec
 import { INotebookModel, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces';
 import { CellType } from 'sql/parts/notebook/models/contracts';
 import { NotebookComponent } from 'sql/parts/notebook/notebook.component';
-import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
-import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
+import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement';
 import { getErrorMessage } from 'sql/parts/notebook/notebookUtils';
-import { noKernel } from 'sql/services/notebook/sessionManager';
+import { noKernel } from 'sql/workbench/services/notebook/common/sessionManager';
 
 const msgLoading = localize('loading', 'Loading kernels...');
 const kernelLabel: string = localize('Kernel', 'Kernel: ');
@@ -284,11 +284,11 @@ export class AttachToDropdown extends SelectBox {
 	}
 
 	/**
-     * Open connection dialog
-     * Enter server details and connect to a server from the dialog
-     * Bind the server value to 'Attach To' drop down
-     * Connected server is displayed at the top of drop down
-     **/
+	 * Open connection dialog
+	 * Enter server details and connect to a server from the dialog
+	 * Bind the server value to 'Attach To' drop down
+	 * Connected server is displayed at the top of drop down
+	 **/
 	public async openConnectionDialog(): Promise<void> {
 		try {
 			//TODO: Figure out how to plumb through the correct provider here

src/sql/parts/notebook/notebookEditor.ts

@@ -16,7 +16,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { NotebookInput } from 'sql/parts/notebook/notebookInput';
 import { NotebookModule } from 'sql/parts/notebook/notebook.module';
 import { NOTEBOOK_SELECTOR } from 'sql/parts/notebook/notebook.component';
-import { INotebookParams, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService';
+import { INotebookParams, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
 
 export class NotebookEditor extends BaseEditor {
 

src/sql/parts/notebook/notebookInput.ts

@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
 import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import * as resources from 'vs/base/common/resources';
 
-import { INotebookService, INotebookEditor } from 'sql/services/notebook/notebookService';
+import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 
@@ -80,7 +80,7 @@ export class NotebookInputModel extends EditorModel {
 
 export class NotebookInputValidator {
 
-	constructor(@IContextKeyService private readonly _contextKeyService: IContextKeyService) {}
+	constructor( @IContextKeyService private readonly _contextKeyService: IContextKeyService) { }
 
 	public isNotebookEnabled(): boolean {
 		return this._contextKeyService.contextMatchesRules(notebooksEnabledCondition);
@@ -202,14 +202,12 @@ export class NotebookInput extends EditorInput {
 	save(): TPromise<boolean> {
 		let activeEditor: INotebookEditor;
 		for (const editor of this.notebookService.listNotebookEditors()) {
-			if(editor.isActive())
-			{
+			if (editor.isActive()) {
 				activeEditor = editor;
 			}
 		}
-		if(activeEditor)
-		{
-			return TPromise.wrap(activeEditor.save().then((val) => {return val;}));
+		if (activeEditor) {
+			return TPromise.wrap(activeEditor.save().then((val) => { return val; }));
 		}
 		return TPromise.wrap(false);
 	}

src/sql/parts/notebook/notebookUtils.ts

@@ -11,7 +11,7 @@ import * as os from 'os';
 import * as pfs from 'vs/base/node/pfs';
 import { localize } from 'vs/nls';
 import { IOutputChannel } from 'vs/workbench/parts/output/common/output';
-import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/services/notebook/notebookService';
+import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 
 
 /**
@@ -44,7 +44,7 @@ export function getProvidersForFileName(fileName: string, notebookService: INote
 	let providers: string[];
 	// First try to get provider for actual file type
 	if (fileExt && fileExt.startsWith('.')) {
-		fileExt = fileExt.slice(1,fileExt.length);
+		fileExt = fileExt.slice(1, fileExt.length);
 		providers = notebookService.getProvidersForFileType(fileExt);
 	}
 	// Fallback to provider for default file type (assume this is a global handler)