From 7d53e744f3ba6bd160e41e4df48f9370d05ba5c7 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Sun, 31 May 2020 13:08:12 -0700
Subject: [PATCH] fix imports

---
 .eslintrc.json                                       |  2 +-
 .../test/browser/advancedPropertiesDialog.test.ts    |  2 +-
 src/sql/workbench/contrib/notebook/test/stubs.ts     |  3 +--
 .../notebook/browser/models/modelInterfaces.ts       | 12 +++++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 0eecdb3218..4078165212 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -625,7 +625,7 @@
                     "**/{vs,sql}/workbench/services/**",
                     "**/{vs,sql}/workbench/contrib/**",
                     "**/{vs,sql}/workbench/test/**",
-                    "*"
+                    "**"
                 ]
             },
             {
diff --git a/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts b/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts
index ad3d0f76f4..28a7f6a553 100644
--- a/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts
+++ b/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts
@@ -8,8 +8,8 @@ import { AdvancedPropertiesController } from 'sql/workbench/services/connection/
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
-import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { ServiceOptionType } from 'sql/platform/connection/common/interfaces';
 
 suite('Advanced properties dialog tests', () => {
 	let advancedController: AdvancedPropertiesController;
diff --git a/src/sql/workbench/contrib/notebook/test/stubs.ts b/src/sql/workbench/contrib/notebook/test/stubs.ts
index 15f5ff26bb..9ba75338b9 100644
--- a/src/sql/workbench/contrib/notebook/test/stubs.ts
+++ b/src/sql/workbench/contrib/notebook/test/stubs.ts
@@ -5,11 +5,10 @@
 
 import { nb, IConnectionProfile } from 'azdata';
 import * as vsEvent from 'vs/base/common/event';
-import { INotebookModel, ICellModel, IClientSession, NotebookContentChange } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
+import { INotebookModel, ICellModel, IClientSession, NotebookContentChange, ISingleNotebookEditOperation } from 'sql/workbench/services/notebook/browser/models/modelInterfaces';
 import { INotebookFindModel } from 'sql/workbench/contrib/notebook/browser/models/notebookFindModel';
 import { NotebookChangeType, CellType } from 'sql/workbench/services/notebook/common/contracts';
 import { INotebookManager, INotebookService, INotebookEditor, ILanguageMagic, INotebookProvider, INavigationProvider, INotebookParams, INotebookSection, ICellEditorProvider, NotebookRange } from 'sql/workbench/services/notebook/browser/notebookService';
-import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils';
 import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
 import { NotebookFindMatch } from 'sql/workbench/contrib/notebook/browser/find/notebookFindDecorations';
diff --git a/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts b/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts
index 0346e715a1..3c1e78114e 100644
--- a/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts
+++ b/src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts
@@ -15,7 +15,6 @@ import { CellType, NotebookChangeType } from 'sql/workbench/services/notebook/co
 import { INotebookManager, ILanguageMagic } from 'sql/workbench/services/notebook/browser/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/workbench/services/notebook/browser/models/notebookUtils';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
@@ -23,6 +22,17 @@ import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/no
 import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents';
 import type { FutureInternal } from 'sql/workbench/services/notebook/browser/interfaces';
 
+export interface ICellRange {
+	readonly start: number;
+	readonly end: number;
+}
+
+export interface ISingleNotebookEditOperation {
+	range: ICellRange;
+	cell: Partial<nb.ICellContents>;
+	forceMoveMarkers: boolean;
+}
+
 export interface IClientSessionOptions {
 	notebookUri: URI;
 	notebookManager: INotebookManager;