Move notebooks to workbench (#4888)

* move notebooks under workbench

* fix style imports

src/sql/parts/common/customInputConverter.ts

@@ -12,7 +12,7 @@ import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
 import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
-import { NotebookInput } from 'sql/parts/notebook/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { notebookModeId } from 'sql/common/constants';

src/sql/workbench/api/node/mainThreadNotebook.ts

@@ -16,7 +16,7 @@ import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workb
 import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager';
 import { Deferred } from 'sql/base/common/promise';
-import { FutureInternal } from 'sql/parts/notebook/models/modelInterfaces';
+import { FutureInternal } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadNotebook)
 export class MainThreadNotebook extends Disposable implements MainThreadNotebookShape {

src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts

@@ -21,12 +21,12 @@ import {
 	SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
 	INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
 } from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { NotebookInput } from 'sql/parts/notebook/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
 import { INotebookService, INotebookEditor, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { disposed } from 'vs/base/common/errors';
-import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { NotebookChangeType, CellTypes } from 'sql/parts/notebook/models/contracts';
+import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/models/contracts';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { notebookModeId } from 'sql/common/constants';

src/sql/workbench/parts/notebook/cellToggleMoreActions.ts

@@ -12,12 +12,12 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import * as DOM from 'vs/base/browser/dom';
 
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { CellContext, CellActionBase } from 'sql/parts/notebook/cellViews/codeActions';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { CellContext, CellActionBase } from 'sql/workbench/parts/notebook/cellViews/codeActions';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 import { ToggleMoreWidgetAction } from 'sql/workbench/parts/dashboard/common/actions';
-import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts';
-import { CellModel } from 'sql/parts/notebook/models/cell';
+import { CellTypes, CellType } from 'sql/workbench/parts/notebook/models/contracts';
+import { CellModel } from 'sql/workbench/parts/notebook/models/cell';
 
 export const HIDDEN_CLASS ='actionhidden';
 

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

@@ -8,11 +8,11 @@ import { OnInit, Component, Input, Inject, ElementRef, ViewChild, Output, EventE
 
 import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor';
-import { CellToggleMoreActions } from 'sql/parts/notebook/cellToggleMoreActions';
-import { ICellModel, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces';
+import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/cellToggleMoreActions';
+import { ICellModel, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { RunCellAction, CellContext } from 'sql/parts/notebook/cellViews/codeActions';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { RunCellAction, CellContext } from 'sql/workbench/parts/notebook/cellViews/codeActions';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import * as themeColors from 'vs/workbench/common/theme';
@@ -27,9 +27,9 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Event, Emitter } from 'vs/base/common/event';
-import { CellTypes } from 'sql/parts/notebook/models/contracts';
+import { CellTypes } from 'sql/workbench/parts/notebook/models/contracts';
 import { OVERRIDE_EDITOR_THEMING_SETTING } from 'sql/workbench/services/notebook/common/notebookService';
-import * as notebookUtils from 'sql/parts/notebook/notebookUtils';
+import * as notebookUtils from 'sql/workbench/parts/notebook/notebookUtils';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 

src/sql/workbench/parts/notebook/cellViews/codeActions.ts

@@ -11,11 +11,11 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import * as types from 'vs/base/common/types';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
-import { getErrorMessage } from 'sql/parts/notebook/notebookUtils';
-import { ICellModel, CellExecutionState } from 'sql/parts/notebook/models/modelInterfaces';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
+import { getErrorMessage } from 'sql/workbench/parts/notebook/notebookUtils';
+import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { MultiStateAction, IMultiStateData, IActionStateData } from 'sql/parts/notebook/notebookActions';
+import { MultiStateAction, IMultiStateData, IActionStateData } from 'sql/workbench/parts/notebook/notebookActions';
 
 let notebookMoreActionMsg = localize('notebook.failed', "Please select active cell and try again");
 const emptyExecutionCountLabel = '[ ]';

src/sql/workbench/parts/notebook/cellViews/codeCell.component.ts

@@ -4,9 +4,9 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, SimpleChange, OnChanges, AfterViewInit } from '@angular/core';
-import { CellView } from 'sql/parts/notebook/cellViews/interfaces';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { CellView } from 'sql/workbench/parts/notebook/cellViews/interfaces';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 
 
 export const CODE_SELECTOR: string = 'code-cell-component';

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

@@ -3,16 +3,16 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 import 'vs/css!./code';
+import 'vs/css!./media/output';
 
 import { OnInit, Component, Input, Inject, ElementRef, ViewChild } from '@angular/core';
 import { AngularDisposable } from 'sql/base/node/lifecycle';
 import { nb } from 'azdata';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
-import { MimeModel } from 'sql/parts/notebook/outputs/common/mimemodel';
-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';
+import { MimeModel } from 'sql/workbench/parts/notebook/outputs/common/mimemodel';
+import * as outputProcessor from 'sql/workbench/parts/notebook/outputs/common/outputProcessor';
+import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/outputs/registry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 export const OUTPUT_SELECTOR: string = 'output-component';

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

@@ -6,7 +6,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/node/lifecycle';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import * as themeColors from 'vs/workbench/common/theme';
 import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 

src/sql/workbench/parts/notebook/cellViews/placeholderCell.component.ts

@@ -5,11 +5,11 @@
 import 'vs/css!./placeholder';
 
 import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, SimpleChange, OnChanges } from '@angular/core';
-import { CellView } from 'sql/parts/notebook/cellViews/interfaces';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { CellView } from 'sql/workbench/parts/notebook/cellViews/interfaces';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 import { localize } from 'vs/nls';
-import { CellType } from 'sql/parts/notebook/models/contracts';
+import { CellType } from 'sql/workbench/parts/notebook/models/contracts';
 
 
 export const PLACEHOLDER_SELECTOR: string = 'placeholder-cell-component';

src/sql/workbench/parts/notebook/cellViews/textCell.component.ts

@@ -16,11 +16,11 @@ import { URI } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
-import { CellView } from 'sql/parts/notebook/cellViews/interfaces';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { ISanitizer, defaultSanitizer } from 'sql/parts/notebook/outputs/sanitizer';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
-import { CellToggleMoreActions } from 'sql/parts/notebook/cellToggleMoreActions';
+import { CellView } from 'sql/workbench/parts/notebook/cellViews/interfaces';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/outputs/sanitizer';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
+import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/cellToggleMoreActions';
 
 export const TEXT_SELECTOR: string = 'text-cell-component';
 

src/sql/workbench/parts/notebook/models/cell.ts

@@ -13,9 +13,9 @@ import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 
 import * as notebookUtils from '../notebookUtils';
-import { CellTypes, CellType, NotebookChangeType } from 'sql/parts/notebook/models/contracts';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
-import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/models/contracts';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
+import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { ICellModelOptions, IModelFactory, FutureInternal, CellExecutionState } from './modelInterfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';

src/sql/workbench/parts/notebook/models/cellMagicMapper.ts

@@ -6,7 +6,7 @@
 
 'use strict';
 
-import { ICellMagicMapper, ILanguageMagic } from 'sql/parts/notebook/models/modelInterfaces';
+import { ICellMagicMapper, ILanguageMagic } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 
 const defaultKernel = '*';
 export class CellMagicMapper implements ICellMagicMapper {

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

@@ -14,16 +14,16 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 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 { CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/models/contracts';
 import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { IStandardKernelWithProvider } from 'sql/parts/notebook/notebookUtils';
+import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/notebookUtils';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { localize } from 'vs/nls';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 
 export interface IClientSessionOptions {
 	notebookUri: URI;

src/sql/workbench/parts/notebook/models/notebookContexts.ts

@@ -8,7 +8,7 @@
 import { nb } from 'azdata';
 
 import { localize } from 'vs/nls';
-import { IDefaultConnection, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces';
+import { IDefaultConnection, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';

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

@@ -12,11 +12,11 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
 
 import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants } from './modelInterfaces';
-import { NotebookChangeType, CellType } from 'sql/parts/notebook/models/contracts';
+import { NotebookChangeType, CellType } from 'sql/workbench/parts/notebook/models/contracts';
 import { nbversion } from '../notebookConstants';
 import * as notebookUtils from '../notebookUtils';
 import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService';
-import { NotebookContexts } from 'sql/parts/notebook/models/notebookContexts';
+import { NotebookContexts } from 'sql/workbench/parts/notebook/models/notebookContexts';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { INotification, Severity } from 'vs/platform/notification/common/notification';
 import { URI } from 'vs/base/common/uri';

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

@@ -21,26 +21,26 @@ import { fillInActions, LabeledMenuItemActionItem } from 'vs/platform/actions/br
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 
 import { AngularDisposable } from 'sql/base/node/lifecycle';
-import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts';
-import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces';
+import { CellTypes, CellType } from 'sql/workbench/parts/notebook/models/contracts';
+import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, 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 { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
+import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory';
+import * as notebookUtils from 'sql/workbench/parts/notebook/notebookUtils';
 import { Deferred } from 'sql/base/common/promise';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
-import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction } from 'sql/parts/notebook/notebookActions';
+import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction } from 'sql/workbench/parts/notebook/notebookActions';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
-import { CellMagicMapper } from 'sql/parts/notebook/models/cellMagicMapper';
+import { CellMagicMapper } from 'sql/workbench/parts/notebook/models/cellMagicMapper';
 import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
-import { CellModel } from 'sql/parts/notebook/models/cell';
+import { CellModel } from 'sql/workbench/parts/notebook/models/cell';
 
 export const NOTEBOOK_SELECTOR: string = 'notebook-component';
 

src/sql/workbench/parts/notebook/notebook.contribution.ts

@@ -6,8 +6,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 
-import { NotebookInput } from 'sql/parts/notebook/notebookInput';
-import { NotebookEditor } from 'sql/parts/notebook/notebookEditor';
+import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
+import { NotebookEditor } from 'sql/workbench/parts/notebook/notebookEditor';
 
 // Model View editor registration
 const viewModelEditorDescriptor = new EditorDescriptor(

src/sql/workbench/parts/notebook/notebook.module.ts

@@ -18,15 +18,15 @@ import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component';
 import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableDropdown.component';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component';
-import { NotebookComponent } from 'sql/parts/notebook/notebook.component';
+import { NotebookComponent } from 'sql/workbench/parts/notebook/notebook.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CodeComponent } from 'sql/parts/notebook/cellViews/code.component';
-import { CodeCellComponent } from 'sql/parts/notebook/cellViews/codeCell.component';
-import { TextCellComponent } from 'sql/parts/notebook/cellViews/textCell.component';
-import { OutputAreaComponent } from 'sql/parts/notebook/cellViews/outputArea.component';
-import { OutputComponent } from 'sql/parts/notebook/cellViews/output.component';
-import { PlaceholderCellComponent } from 'sql/parts/notebook/cellViews/placeholderCell.component';
+import { CodeComponent } from 'sql/workbench/parts/notebook/cellViews/code.component';
+import { CodeCellComponent } from 'sql/workbench/parts/notebook/cellViews/codeCell.component';
+import { TextCellComponent } from 'sql/workbench/parts/notebook/cellViews/textCell.component';
+import { OutputAreaComponent } from 'sql/workbench/parts/notebook/cellViews/outputArea.component';
+import { OutputComponent } from 'sql/workbench/parts/notebook/cellViews/output.component';
+import { PlaceholderCellComponent } from 'sql/workbench/parts/notebook/cellViews/placeholderCell.component';
 import LoadingSpinner from 'sql/parts/modelComponents/loadingSpinner.component';
 
 export const NotebookModule = (params, selector: string, instantiationService: IInstantiationService): any => {

src/sql/workbench/parts/notebook/notebookActions.ts

@@ -11,16 +11,16 @@ import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview
 import { INotificationService, Severity, INotificationActions } from 'vs/platform/notification/common/notification';
 
 import { SelectBox, ISelectBoxOptionsWithLabel } from 'sql/base/browser/ui/selectBox/selectBox';
-import { INotebookModel } from 'sql/parts/notebook/models/modelInterfaces';
-import { CellType, CellTypes } from 'sql/parts/notebook/models/contracts';
-import { NotebookComponent } from 'sql/parts/notebook/notebook.component';
-import { getErrorMessage, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/parts/notebook/notebookUtils';
+import { INotebookModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { CellType, CellTypes } from 'sql/workbench/parts/notebook/models/contracts';
+import { NotebookComponent } from 'sql/workbench/parts/notebook/notebook.component';
+import { getErrorMessage, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/parts/notebook/notebookUtils';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { noKernel } from 'sql/workbench/services/notebook/common/sessionManager';
 import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
-import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel';
 import { generateUri } from 'sql/platform/connection/common/utils';
 
 const msgLoading = localize('loading', "Loading kernels...");

src/sql/workbench/parts/notebook/notebookEditor.ts

@@ -11,9 +11,9 @@ import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 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 { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
+import { NotebookModule } from 'sql/workbench/parts/notebook/notebook.module';
+import { NOTEBOOK_SELECTOR } from 'sql/workbench/parts/notebook/notebook.component';
 import { INotebookParams } from 'sql/workbench/services/notebook/common/notebookService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { $ } from 'sql/base/browser/builder';

src/sql/workbench/parts/notebook/notebookInput.ts

@@ -12,11 +12,11 @@ import { URI } from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import * as azdata from 'azdata';
 
-import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/parts/notebook/notebookUtils';
+import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/workbench/parts/notebook/notebookUtils';
 import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { INotebookModel, IContentManager } from 'sql/parts/notebook/models/modelInterfaces';
+import { INotebookModel, IContentManager } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { Range } from 'vs/editor/common/core/range';
 import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel';

src/sql/workbench/parts/notebook/outputs/widgets.ts

@@ -7,7 +7,7 @@
 import * as renderers from './renderers';
 import { IRenderMime } from './common/renderMimeInterfaces';
 import { ReadonlyJSONObject } from '../models/jsonext';
-import * as tableRenderers from 'sql/parts/notebook/outputs/tableRenderers';
+import * as tableRenderers from 'sql/workbench/parts/notebook/outputs/tableRenderers';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 /**

src/sql/workbench/services/notebook/common/notebookService.ts

@@ -11,12 +11,12 @@ import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { URI } from 'vs/base/common/uri';
 import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
-import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry';
-import { ModelFactory } from 'sql/parts/notebook/models/modelFactory';
+import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/outputs/registry';
+import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { NotebookInput } from 'sql/parts/notebook/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { ICellModel, INotebookModel, ILanguageMagic } from 'sql/parts/notebook/models/modelInterfaces';
+import { ICellModel, INotebookModel, ILanguageMagic } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 
 export const SERVICE_ID = 'notebookService';
 export const INotebookService = createDecorator<INotebookService>(SERVICE_ID);

src/sql/workbench/services/notebook/common/notebookServiceImpl.ts

@@ -14,8 +14,8 @@ import {
 	INotebookService, INotebookManager, INotebookProvider, DEFAULT_NOTEBOOK_PROVIDER,
 	DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER, OVERRIDE_EDITOR_THEMING_SETTING
 } from 'sql/workbench/services/notebook/common/notebookService';
-import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry';
-import { standardRendererFactories } from 'sql/parts/notebook/outputs/factories';
+import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/outputs/registry';
+import { standardRendererFactories } from 'sql/workbench/parts/notebook/outputs/factories';
 import { Extensions, INotebookProviderRegistry, NotebookProviderRegistration } from 'sql/workbench/services/notebook/common/notebookRegistry';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Memento } from 'vs/workbench/common/memento';
@@ -28,11 +28,11 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { NotebookEditorVisibleContext } from 'sql/workbench/services/notebook/common/notebookContext';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { NotebookEditor } from 'sql/parts/notebook/notebookEditor';
+import { NotebookEditor } from 'sql/workbench/parts/notebook/notebookEditor';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { registerNotebookThemes } from 'sql/parts/notebook/notebookStyles';
+import { registerNotebookThemes } from 'sql/workbench/parts/notebook/notebookStyles';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
-import { ILanguageMagic, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces';
+import { ILanguageMagic, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { SqlNotebookProvider } from 'sql/workbench/services/notebook/sql/sqlNotebookProvider';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';

src/sql/workbench/services/notebook/common/sessionManager.ts

@@ -6,7 +6,7 @@
 
 import { nb } from 'azdata';
 import { localize } from 'vs/nls';
-import { FutureInternal } from 'sql/parts/notebook/models/modelInterfaces';
+import { FutureInternal } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 
 export const noKernel: string = localize('noKernel', 'No Kernel');

src/sql/workbench/services/notebook/node/localContentManager.ts

@@ -14,10 +14,10 @@ import * as pfs from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 
-import { JSONObject } from 'sql/parts/notebook/models/jsonext';
-import { OutputTypes } from 'sql/parts/notebook/models/contracts';
-import { nbversion } from 'sql/parts/notebook/notebookConstants';
-import { nbformat } from 'sql/parts/notebook/models/nbformat';
+import { JSONObject } from 'sql/workbench/parts/notebook/models/jsonext';
+import { OutputTypes } from 'sql/workbench/parts/notebook/models/contracts';
+import { nbversion } from 'sql/workbench/parts/notebook/notebookConstants';
+import { nbformat } from 'sql/workbench/parts/notebook/models/nbformat';
 
 type MimeBundle = { [key: string]: string | string[] | undefined };
 

src/sql/workbench/services/notebook/sql/sqlSessionManager.ts

@@ -8,7 +8,7 @@ import * as os from 'os';
 import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'azdata';
 import { localize } from 'vs/nls';
 import * as strings from 'vs/base/common/strings';
-import { FutureInternal, ILanguageMagic, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces';
+import { FutureInternal, ILanguageMagic, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces';
 import QueryRunner, { EventType } from 'sql/platform/query/common/queryRunner';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -21,7 +21,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { escape } from 'sql/base/common/strings';
 import { elapsedTimeLabel } from 'sql/parts/query/common/localizedConstants';
-import * as notebookUtils from 'sql/parts/notebook/notebookUtils';
+import * as notebookUtils from 'sql/workbench/parts/notebook/notebookUtils';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';