diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index b9e4f22cf0..1ef4113c11 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -113,7 +113,7 @@ const vscodeResources = [ 'out-build/sql/parts/jobManagement/common/media/*.svg', 'out-build/sql/media/objectTypes/*.svg', 'out-build/sql/media/icons/*.svg', - 'out-build/sql/parts/notebook/media/**/*.svg', + 'out-build/sql/workbench/parts/notebook/media/**/*.svg', '!**/test/**' ]; diff --git a/extensions/integration-tests/yarn.lock b/extensions/integration-tests/yarn.lock index 66ac8b2e7a..221f5e3ee2 100644 --- a/extensions/integration-tests/yarn.lock +++ b/extensions/integration-tests/yarn.lock @@ -446,11 +446,6 @@ diff@3.2.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9" integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k= -dotenv@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c" - integrity sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g== - duplexer2@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" diff --git a/src/sql/parts/common/customInputConverter.ts b/src/sql/parts/common/customInputConverter.ts index cf130c5df8..85e7c1053e 100644 --- a/src/sql/parts/common/customInputConverter.ts +++ b/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'; diff --git a/src/sql/workbench/api/node/mainThreadNotebook.ts b/src/sql/workbench/api/node/mainThreadNotebook.ts index d7b7de843c..7460e81031 100644 --- a/src/sql/workbench/api/node/mainThreadNotebook.ts +++ b/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 { diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index d32be5f52f..fc627f2465 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellToggleMoreActions.ts b/src/sql/workbench/parts/notebook/cellToggleMoreActions.ts similarity index 92% rename from src/sql/parts/notebook/cellToggleMoreActions.ts rename to src/sql/workbench/parts/notebook/cellToggleMoreActions.ts index 5cc52a363a..5427cd0bde 100644 --- a/src/sql/parts/notebook/cellToggleMoreActions.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/code.component.html b/src/sql/workbench/parts/notebook/cellViews/code.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/code.component.html rename to src/sql/workbench/parts/notebook/cellViews/code.component.html diff --git a/src/sql/parts/notebook/cellViews/code.component.ts b/src/sql/workbench/parts/notebook/cellViews/code.component.ts similarity index 95% rename from src/sql/parts/notebook/cellViews/code.component.ts rename to src/sql/workbench/parts/notebook/cellViews/code.component.ts index a267d72740..03fb07b3aa 100644 --- a/src/sql/parts/notebook/cellViews/code.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/code.css b/src/sql/workbench/parts/notebook/cellViews/code.css similarity index 100% rename from src/sql/parts/notebook/cellViews/code.css rename to src/sql/workbench/parts/notebook/cellViews/code.css diff --git a/src/sql/parts/notebook/cellViews/codeActions.ts b/src/sql/workbench/parts/notebook/cellViews/codeActions.ts similarity index 93% rename from src/sql/parts/notebook/cellViews/codeActions.ts rename to src/sql/workbench/parts/notebook/cellViews/codeActions.ts index 9ec94c6fdf..d6fd7fd57c 100644 --- a/src/sql/parts/notebook/cellViews/codeActions.ts +++ b/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 = '[ ]'; diff --git a/src/sql/parts/notebook/cellViews/codeCell.component.html b/src/sql/workbench/parts/notebook/cellViews/codeCell.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/codeCell.component.html rename to src/sql/workbench/parts/notebook/cellViews/codeCell.component.html diff --git a/src/sql/parts/notebook/cellViews/codeCell.component.ts b/src/sql/workbench/parts/notebook/cellViews/codeCell.component.ts similarity index 87% rename from src/sql/parts/notebook/cellViews/codeCell.component.ts rename to src/sql/workbench/parts/notebook/cellViews/codeCell.component.ts index ffe4603de5..56c67ac23e 100644 --- a/src/sql/parts/notebook/cellViews/codeCell.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/interfaces.ts b/src/sql/workbench/parts/notebook/cellViews/interfaces.ts similarity index 100% rename from src/sql/parts/notebook/cellViews/interfaces.ts rename to src/sql/workbench/parts/notebook/cellViews/interfaces.ts diff --git a/src/sql/parts/notebook/outputs/style/index.css b/src/sql/workbench/parts/notebook/cellViews/media/output.css similarity index 100% rename from src/sql/parts/notebook/outputs/style/index.css rename to src/sql/workbench/parts/notebook/cellViews/media/output.css diff --git a/src/sql/parts/notebook/cellViews/output.component.html b/src/sql/workbench/parts/notebook/cellViews/output.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/output.component.html rename to src/sql/workbench/parts/notebook/cellViews/output.component.html diff --git a/src/sql/parts/notebook/cellViews/output.component.ts b/src/sql/workbench/parts/notebook/cellViews/output.component.ts similarity index 89% rename from src/sql/parts/notebook/cellViews/output.component.ts rename to src/sql/workbench/parts/notebook/cellViews/output.component.ts index a3cc22272d..647b83adff 100644 --- a/src/sql/parts/notebook/cellViews/output.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/outputArea.component.html b/src/sql/workbench/parts/notebook/cellViews/outputArea.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/outputArea.component.html rename to src/sql/workbench/parts/notebook/cellViews/outputArea.component.html diff --git a/src/sql/parts/notebook/cellViews/outputArea.component.ts b/src/sql/workbench/parts/notebook/cellViews/outputArea.component.ts similarity index 95% rename from src/sql/parts/notebook/cellViews/outputArea.component.ts rename to src/sql/workbench/parts/notebook/cellViews/outputArea.component.ts index 9eac59741b..ccdfe22df0 100644 --- a/src/sql/parts/notebook/cellViews/outputArea.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/outputArea.css b/src/sql/workbench/parts/notebook/cellViews/outputArea.css similarity index 100% rename from src/sql/parts/notebook/cellViews/outputArea.css rename to src/sql/workbench/parts/notebook/cellViews/outputArea.css diff --git a/src/sql/parts/notebook/cellViews/placeholder.css b/src/sql/workbench/parts/notebook/cellViews/placeholder.css similarity index 100% rename from src/sql/parts/notebook/cellViews/placeholder.css rename to src/sql/workbench/parts/notebook/cellViews/placeholder.css diff --git a/src/sql/parts/notebook/cellViews/placeholderCell.component.html b/src/sql/workbench/parts/notebook/cellViews/placeholderCell.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/placeholderCell.component.html rename to src/sql/workbench/parts/notebook/cellViews/placeholderCell.component.html diff --git a/src/sql/parts/notebook/cellViews/placeholderCell.component.ts b/src/sql/workbench/parts/notebook/cellViews/placeholderCell.component.ts similarity index 86% rename from src/sql/parts/notebook/cellViews/placeholderCell.component.ts rename to src/sql/workbench/parts/notebook/cellViews/placeholderCell.component.ts index 38b73ce8e6..838b220e38 100644 --- a/src/sql/parts/notebook/cellViews/placeholderCell.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/textCell.component.html b/src/sql/workbench/parts/notebook/cellViews/textCell.component.html similarity index 100% rename from src/sql/parts/notebook/cellViews/textCell.component.html rename to src/sql/workbench/parts/notebook/cellViews/textCell.component.html diff --git a/src/sql/parts/notebook/cellViews/textCell.component.ts b/src/sql/workbench/parts/notebook/cellViews/textCell.component.ts similarity index 94% rename from src/sql/parts/notebook/cellViews/textCell.component.ts rename to src/sql/workbench/parts/notebook/cellViews/textCell.component.ts index 783bf0e338..0a7186a313 100644 --- a/src/sql/parts/notebook/cellViews/textCell.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/cellViews/textCell.css b/src/sql/workbench/parts/notebook/cellViews/textCell.css similarity index 100% rename from src/sql/parts/notebook/cellViews/textCell.css rename to src/sql/workbench/parts/notebook/cellViews/textCell.css diff --git a/src/sql/parts/notebook/media/dark/add_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/add_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/add_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/add_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/clear_results_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/clear_results_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/clear_results_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/clear_results_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/execute_cell_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/execute_cell_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/execute_cell_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/execute_cell_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/nottrusted_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/nottrusted_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/nottrusted_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/nottrusted_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/run_cells_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/run_cells_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/run_cells_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/run_cells_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/stop_cell_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/stop_cell_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/stop_cell_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/stop_cell_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/stop_cell_solidanimation_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/stop_cell_solidanimation_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/stop_cell_solidanimation_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/stop_cell_solidanimation_inverse.svg diff --git a/src/sql/parts/notebook/media/dark/trusted_inverse.svg b/src/sql/workbench/parts/notebook/media/dark/trusted_inverse.svg similarity index 100% rename from src/sql/parts/notebook/media/dark/trusted_inverse.svg rename to src/sql/workbench/parts/notebook/media/dark/trusted_inverse.svg diff --git a/src/sql/parts/notebook/media/light/add.svg b/src/sql/workbench/parts/notebook/media/light/add.svg similarity index 100% rename from src/sql/parts/notebook/media/light/add.svg rename to src/sql/workbench/parts/notebook/media/light/add.svg diff --git a/src/sql/parts/notebook/media/light/clear_results.svg b/src/sql/workbench/parts/notebook/media/light/clear_results.svg similarity index 100% rename from src/sql/parts/notebook/media/light/clear_results.svg rename to src/sql/workbench/parts/notebook/media/light/clear_results.svg diff --git a/src/sql/parts/notebook/media/light/execute_cell.svg b/src/sql/workbench/parts/notebook/media/light/execute_cell.svg similarity index 100% rename from src/sql/parts/notebook/media/light/execute_cell.svg rename to src/sql/workbench/parts/notebook/media/light/execute_cell.svg diff --git a/src/sql/parts/notebook/media/light/execute_cell_error.svg b/src/sql/workbench/parts/notebook/media/light/execute_cell_error.svg similarity index 100% rename from src/sql/parts/notebook/media/light/execute_cell_error.svg rename to src/sql/workbench/parts/notebook/media/light/execute_cell_error.svg diff --git a/src/sql/parts/notebook/media/light/nottrusted.svg b/src/sql/workbench/parts/notebook/media/light/nottrusted.svg similarity index 100% rename from src/sql/parts/notebook/media/light/nottrusted.svg rename to src/sql/workbench/parts/notebook/media/light/nottrusted.svg diff --git a/src/sql/parts/notebook/media/light/run_cells.svg b/src/sql/workbench/parts/notebook/media/light/run_cells.svg similarity index 100% rename from src/sql/parts/notebook/media/light/run_cells.svg rename to src/sql/workbench/parts/notebook/media/light/run_cells.svg diff --git a/src/sql/parts/notebook/media/light/stop_cell.svg b/src/sql/workbench/parts/notebook/media/light/stop_cell.svg similarity index 100% rename from src/sql/parts/notebook/media/light/stop_cell.svg rename to src/sql/workbench/parts/notebook/media/light/stop_cell.svg diff --git a/src/sql/parts/notebook/media/light/stop_cell_solidanimation.svg b/src/sql/workbench/parts/notebook/media/light/stop_cell_solidanimation.svg similarity index 100% rename from src/sql/parts/notebook/media/light/stop_cell_solidanimation.svg rename to src/sql/workbench/parts/notebook/media/light/stop_cell_solidanimation.svg diff --git a/src/sql/parts/notebook/media/light/trusted.svg b/src/sql/workbench/parts/notebook/media/light/trusted.svg similarity index 100% rename from src/sql/parts/notebook/media/light/trusted.svg rename to src/sql/workbench/parts/notebook/media/light/trusted.svg diff --git a/src/sql/parts/notebook/models/cell.ts b/src/sql/workbench/parts/notebook/models/cell.ts similarity index 98% rename from src/sql/parts/notebook/models/cell.ts rename to src/sql/workbench/parts/notebook/models/cell.ts index 76481698e7..c169d01143 100644 --- a/src/sql/parts/notebook/models/cell.ts +++ b/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'; diff --git a/src/sql/parts/notebook/models/cellMagicMapper.ts b/src/sql/workbench/parts/notebook/models/cellMagicMapper.ts similarity index 94% rename from src/sql/parts/notebook/models/cellMagicMapper.ts rename to src/sql/workbench/parts/notebook/models/cellMagicMapper.ts index 1cd2fcb0f4..fb7435df14 100644 --- a/src/sql/parts/notebook/models/cellMagicMapper.ts +++ b/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 { diff --git a/src/sql/parts/notebook/models/clientSession.ts b/src/sql/workbench/parts/notebook/models/clientSession.ts similarity index 100% rename from src/sql/parts/notebook/models/clientSession.ts rename to src/sql/workbench/parts/notebook/models/clientSession.ts diff --git a/src/sql/parts/notebook/models/contracts.ts b/src/sql/workbench/parts/notebook/models/contracts.ts similarity index 100% rename from src/sql/parts/notebook/models/contracts.ts rename to src/sql/workbench/parts/notebook/models/contracts.ts diff --git a/src/sql/parts/notebook/models/jsonext.ts b/src/sql/workbench/parts/notebook/models/jsonext.ts similarity index 100% rename from src/sql/parts/notebook/models/jsonext.ts rename to src/sql/workbench/parts/notebook/models/jsonext.ts diff --git a/src/sql/parts/notebook/models/modelFactory.ts b/src/sql/workbench/parts/notebook/models/modelFactory.ts similarity index 100% rename from src/sql/parts/notebook/models/modelFactory.ts rename to src/sql/workbench/parts/notebook/models/modelFactory.ts diff --git a/src/sql/parts/notebook/models/modelInterfaces.ts b/src/sql/workbench/parts/notebook/models/modelInterfaces.ts similarity index 98% rename from src/sql/parts/notebook/models/modelInterfaces.ts rename to src/sql/workbench/parts/notebook/models/modelInterfaces.ts index d1f7679ae0..bbc6a0dc2d 100644 --- a/src/sql/parts/notebook/models/modelInterfaces.ts +++ b/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; diff --git a/src/sql/parts/notebook/models/nbformat.ts b/src/sql/workbench/parts/notebook/models/nbformat.ts similarity index 100% rename from src/sql/parts/notebook/models/nbformat.ts rename to src/sql/workbench/parts/notebook/models/nbformat.ts diff --git a/src/sql/parts/notebook/models/notebookConnection.ts b/src/sql/workbench/parts/notebook/models/notebookConnection.ts similarity index 100% rename from src/sql/parts/notebook/models/notebookConnection.ts rename to src/sql/workbench/parts/notebook/models/notebookConnection.ts diff --git a/src/sql/parts/notebook/models/notebookContexts.ts b/src/sql/workbench/parts/notebook/models/notebookContexts.ts similarity index 98% rename from src/sql/parts/notebook/models/notebookContexts.ts rename to src/sql/workbench/parts/notebook/models/notebookContexts.ts index e39588db81..d44d09354b 100644 --- a/src/sql/parts/notebook/models/notebookContexts.ts +++ b/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'; diff --git a/src/sql/parts/notebook/models/notebookModel.ts b/src/sql/workbench/parts/notebook/models/notebookModel.ts similarity index 99% rename from src/sql/parts/notebook/models/notebookModel.ts rename to src/sql/workbench/parts/notebook/models/notebookModel.ts index 48121093c3..d616168fda 100644 --- a/src/sql/parts/notebook/models/notebookModel.ts +++ b/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'; diff --git a/src/sql/parts/notebook/notebook.component.html b/src/sql/workbench/parts/notebook/notebook.component.html similarity index 100% rename from src/sql/parts/notebook/notebook.component.html rename to src/sql/workbench/parts/notebook/notebook.component.html diff --git a/src/sql/parts/notebook/notebook.component.ts b/src/sql/workbench/parts/notebook/notebook.component.ts similarity index 96% rename from src/sql/parts/notebook/notebook.component.ts rename to src/sql/workbench/parts/notebook/notebook.component.ts index 8fb2cd09b5..e941d015b0 100644 --- a/src/sql/parts/notebook/notebook.component.ts +++ b/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'; diff --git a/src/sql/parts/notebook/notebook.contribution.ts b/src/sql/workbench/parts/notebook/notebook.contribution.ts similarity index 85% rename from src/sql/parts/notebook/notebook.contribution.ts rename to src/sql/workbench/parts/notebook/notebook.contribution.ts index 66d6e19017..3f8e5f8990 100644 --- a/src/sql/parts/notebook/notebook.contribution.ts +++ b/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( diff --git a/src/sql/parts/notebook/notebook.css b/src/sql/workbench/parts/notebook/notebook.css similarity index 100% rename from src/sql/parts/notebook/notebook.css rename to src/sql/workbench/parts/notebook/notebook.css diff --git a/src/sql/parts/notebook/notebook.module.ts b/src/sql/workbench/parts/notebook/notebook.module.ts similarity index 80% rename from src/sql/parts/notebook/notebook.module.ts rename to src/sql/workbench/parts/notebook/notebook.module.ts index f22413bd89..c0d5e72a70 100644 --- a/src/sql/parts/notebook/notebook.module.ts +++ b/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 => { diff --git a/src/sql/parts/notebook/notebookActions.ts b/src/sql/workbench/parts/notebook/notebookActions.ts similarity index 97% rename from src/sql/parts/notebook/notebookActions.ts rename to src/sql/workbench/parts/notebook/notebookActions.ts index 9778d45110..90cc580ff1 100644 --- a/src/sql/parts/notebook/notebookActions.ts +++ b/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..."); diff --git a/src/sql/parts/notebook/notebookConstants.ts b/src/sql/workbench/parts/notebook/notebookConstants.ts similarity index 100% rename from src/sql/parts/notebook/notebookConstants.ts rename to src/sql/workbench/parts/notebook/notebookConstants.ts diff --git a/src/sql/parts/notebook/notebookEditor.ts b/src/sql/workbench/parts/notebook/notebookEditor.ts similarity index 93% rename from src/sql/parts/notebook/notebookEditor.ts rename to src/sql/workbench/parts/notebook/notebookEditor.ts index c1898c83fe..020acad9b6 100644 --- a/src/sql/parts/notebook/notebookEditor.ts +++ b/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'; diff --git a/src/sql/parts/notebook/notebookInput.ts b/src/sql/workbench/parts/notebook/notebookInput.ts similarity index 98% rename from src/sql/parts/notebook/notebookInput.ts rename to src/sql/workbench/parts/notebook/notebookInput.ts index 1137cea8f5..a211f8eb03 100644 --- a/src/sql/parts/notebook/notebookInput.ts +++ b/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'; diff --git a/src/sql/parts/notebook/notebookStyles.ts b/src/sql/workbench/parts/notebook/notebookStyles.ts similarity index 100% rename from src/sql/parts/notebook/notebookStyles.ts rename to src/sql/workbench/parts/notebook/notebookStyles.ts diff --git a/src/sql/parts/notebook/notebookUtils.ts b/src/sql/workbench/parts/notebook/notebookUtils.ts similarity index 100% rename from src/sql/parts/notebook/notebookUtils.ts rename to src/sql/workbench/parts/notebook/notebookUtils.ts diff --git a/src/sql/parts/notebook/outputs/common/mimemodel.ts b/src/sql/workbench/parts/notebook/outputs/common/mimemodel.ts similarity index 100% rename from src/sql/parts/notebook/outputs/common/mimemodel.ts rename to src/sql/workbench/parts/notebook/outputs/common/mimemodel.ts diff --git a/src/sql/parts/notebook/outputs/common/outputProcessor.ts b/src/sql/workbench/parts/notebook/outputs/common/outputProcessor.ts similarity index 100% rename from src/sql/parts/notebook/outputs/common/outputProcessor.ts rename to src/sql/workbench/parts/notebook/outputs/common/outputProcessor.ts diff --git a/src/sql/parts/notebook/outputs/common/renderMimeInterfaces.ts b/src/sql/workbench/parts/notebook/outputs/common/renderMimeInterfaces.ts similarity index 100% rename from src/sql/parts/notebook/outputs/common/renderMimeInterfaces.ts rename to src/sql/workbench/parts/notebook/outputs/common/renderMimeInterfaces.ts diff --git a/src/sql/parts/notebook/outputs/common/url.ts b/src/sql/workbench/parts/notebook/outputs/common/url.ts similarity index 100% rename from src/sql/parts/notebook/outputs/common/url.ts rename to src/sql/workbench/parts/notebook/outputs/common/url.ts diff --git a/src/sql/parts/notebook/outputs/factories.ts b/src/sql/workbench/parts/notebook/outputs/factories.ts similarity index 100% rename from src/sql/parts/notebook/outputs/factories.ts rename to src/sql/workbench/parts/notebook/outputs/factories.ts diff --git a/src/sql/parts/notebook/outputs/registry.ts b/src/sql/workbench/parts/notebook/outputs/registry.ts similarity index 100% rename from src/sql/parts/notebook/outputs/registry.ts rename to src/sql/workbench/parts/notebook/outputs/registry.ts diff --git a/src/sql/parts/notebook/outputs/renderers.ts b/src/sql/workbench/parts/notebook/outputs/renderers.ts similarity index 100% rename from src/sql/parts/notebook/outputs/renderers.ts rename to src/sql/workbench/parts/notebook/outputs/renderers.ts diff --git a/src/sql/parts/notebook/outputs/sanitizer.ts b/src/sql/workbench/parts/notebook/outputs/sanitizer.ts similarity index 100% rename from src/sql/parts/notebook/outputs/sanitizer.ts rename to src/sql/workbench/parts/notebook/outputs/sanitizer.ts diff --git a/src/sql/parts/notebook/outputs/tableRenderers.ts b/src/sql/workbench/parts/notebook/outputs/tableRenderers.ts similarity index 100% rename from src/sql/parts/notebook/outputs/tableRenderers.ts rename to src/sql/workbench/parts/notebook/outputs/tableRenderers.ts diff --git a/src/sql/parts/notebook/outputs/widgets.ts b/src/sql/workbench/parts/notebook/outputs/widgets.ts similarity index 99% rename from src/sql/parts/notebook/outputs/widgets.ts rename to src/sql/workbench/parts/notebook/outputs/widgets.ts index 7c9469788f..c316f8e02a 100644 --- a/src/sql/parts/notebook/outputs/widgets.ts +++ b/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'; /** diff --git a/src/sql/workbench/services/notebook/common/notebookService.ts b/src/sql/workbench/services/notebook/common/notebookService.ts index b227023aca..c94f157dae 100644 --- a/src/sql/workbench/services/notebook/common/notebookService.ts +++ b/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(SERVICE_ID); diff --git a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts index 99c300807f..e684777be8 100644 --- a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts +++ b/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'; diff --git a/src/sql/workbench/services/notebook/common/sessionManager.ts b/src/sql/workbench/services/notebook/common/sessionManager.ts index 817bf982df..8fa589f261 100644 --- a/src/sql/workbench/services/notebook/common/sessionManager.ts +++ b/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'); diff --git a/src/sql/workbench/services/notebook/node/localContentManager.ts b/src/sql/workbench/services/notebook/node/localContentManager.ts index a837e94234..e5983abe94 100644 --- a/src/sql/workbench/services/notebook/node/localContentManager.ts +++ b/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 }; diff --git a/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts index 45e9836187..ec221a21c9 100644 --- a/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts +++ b/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'; diff --git a/src/sqltest/parts/notebook/common.ts b/src/sqltest/parts/notebook/common.ts index 3728a00778..d8825f9f1c 100644 --- a/src/sqltest/parts/notebook/common.ts +++ b/src/sqltest/parts/notebook/common.ts @@ -8,11 +8,11 @@ import { nb, IConnectionProfile } from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; -import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces'; -import { NotebookChangeType, CellType } from 'sql/parts/notebook/models/contracts'; +import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/workbench/parts/notebook/models/modelInterfaces'; +import { NotebookChangeType, CellType } from 'sql/workbench/parts/notebook/models/contracts'; import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IStandardKernelWithProvider } from 'sql/parts/notebook/notebookUtils'; +import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/notebookUtils'; export class NotebookModelStub implements INotebookModel { constructor(private _languageInfo?: nb.ILanguageInfo) { diff --git a/src/sqltest/parts/notebook/model/cell.test.ts b/src/sqltest/parts/notebook/model/cell.test.ts index c581a59ef5..9a0c7021aa 100644 --- a/src/sqltest/parts/notebook/model/cell.test.ts +++ b/src/sqltest/parts/notebook/model/cell.test.ts @@ -11,11 +11,11 @@ import { nb } from 'azdata'; import * as objects from 'vs/base/common/objects'; -import { CellTypes } from 'sql/parts/notebook/models/contracts'; -import { ModelFactory } from 'sql/parts/notebook/models/modelFactory'; +import { CellTypes } from 'sql/workbench/parts/notebook/models/contracts'; +import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory'; import { NotebookModelStub } from '../common'; import { EmptyFuture } from 'sql/workbench/services/notebook/common/sessionManager'; -import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces'; suite('Cell Model', function (): void { let factory = new ModelFactory(); diff --git a/src/sqltest/parts/notebook/model/clientSession.test.ts b/src/sqltest/parts/notebook/model/clientSession.test.ts index 6d0a1c79d6..c6c46fe308 100644 --- a/src/sqltest/parts/notebook/model/clientSession.test.ts +++ b/src/sqltest/parts/notebook/model/clientSession.test.ts @@ -14,7 +14,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { URI } from 'vs/base/common/uri'; -import { ClientSession } from 'sql/parts/notebook/models/clientSession'; +import { ClientSession } from 'sql/workbench/parts/notebook/models/clientSession'; import { SessionManager, EmptySession } from 'sql/workbench/services/notebook/common/sessionManager'; import { NotebookManagerStub, ServerManagerStub } from 'sqltest/parts/notebook/common'; diff --git a/src/sqltest/parts/notebook/model/contentManagers.test.ts b/src/sqltest/parts/notebook/model/contentManagers.test.ts index 930fa75421..144420369c 100644 --- a/src/sqltest/parts/notebook/model/contentManagers.test.ts +++ b/src/sqltest/parts/notebook/model/contentManagers.test.ts @@ -12,7 +12,7 @@ import { URI } from 'vs/base/common/uri'; import * as tempWrite from 'temp-write'; import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; import * as testUtils from '../../../utils/testUtils'; -import { CellTypes } from 'sql/parts/notebook/models/contracts'; +import { CellTypes } from 'sql/workbench/parts/notebook/models/contracts'; let expectedNotebookContent: nb.INotebookContents = { cells: [{ diff --git a/src/sqltest/parts/notebook/model/notebookModel.test.ts b/src/sqltest/parts/notebook/model/notebookModel.test.ts index 8e1fe7b817..5a1468e4e7 100644 --- a/src/sqltest/parts/notebook/model/notebookModel.test.ts +++ b/src/sqltest/parts/notebook/model/notebookModel.test.ts @@ -16,11 +16,11 @@ import { URI } from 'vs/base/common/uri'; import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; import * as testUtils from '../../../utils/testUtils'; import { NotebookManagerStub } from '../common'; -import { NotebookModel } from 'sql/parts/notebook/models/notebookModel'; -import { ModelFactory } from 'sql/parts/notebook/models/modelFactory'; -import { IClientSession, ICellModel, INotebookModelOptions } from 'sql/parts/notebook/models/modelInterfaces'; -import { ClientSession } from 'sql/parts/notebook/models/clientSession'; -import { CellTypes } from 'sql/parts/notebook/models/contracts'; +import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel'; +import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory'; +import { IClientSession, ICellModel, INotebookModelOptions } from 'sql/workbench/parts/notebook/models/modelInterfaces'; +import { ClientSession } from 'sql/workbench/parts/notebook/models/clientSession'; +import { CellTypes } from 'sql/workbench/parts/notebook/models/contracts'; import { Deferred } from 'sql/base/common/promise'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { Memento } from 'vs/workbench/common/memento'; diff --git a/src/sqltest/parts/notebook/model/notebookUtils.test.ts b/src/sqltest/parts/notebook/model/notebookUtils.test.ts index 1a451fa0ab..b38a713307 100644 --- a/src/sqltest/parts/notebook/model/notebookUtils.test.ts +++ b/src/sqltest/parts/notebook/model/notebookUtils.test.ts @@ -10,7 +10,7 @@ import { nb, IConnectionProfile } from 'azdata'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/parts/notebook/notebookUtils'; +import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/parts/notebook/notebookUtils'; suite('notebookUtils', function(): void { let conn: IConnectionProfile = { diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index c5958ff2bb..8a5afc9965 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -17,7 +17,7 @@ import { coalesce } from 'vs/base/common/arrays'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import * as CustomInputConverter from 'sql/parts/common/customInputConverter'; -import { NotebookInput } from 'sql/parts/notebook/notebookInput'; +import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput'; const EditorOpenPositioning = { LEFT: 'left', diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index a1245fa49f..1eeed31b72 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -475,7 +475,7 @@ import 'sql/parts/modelComponents/components.contribution'; /* View Model Editor */ import 'sql/parts/modelComponents/modelEditor/modelViewEditor.contribution'; /* Notebook Editor */ -import 'sql/parts/notebook/notebook.contribution'; +import 'sql/workbench/parts/notebook/notebook.contribution'; /* Containers */ import 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution'; import 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution';