diff --git a/src/vs/base/parts/tree/browser/loading-dark.svg b/src/sql/base/parts/tree/browser/loading-dark.svg similarity index 100% rename from src/vs/base/parts/tree/browser/loading-dark.svg rename to src/sql/base/parts/tree/browser/loading-dark.svg diff --git a/src/vs/base/parts/tree/browser/loading-hc.svg b/src/sql/base/parts/tree/browser/loading-hc.svg similarity index 100% rename from src/vs/base/parts/tree/browser/loading-hc.svg rename to src/sql/base/parts/tree/browser/loading-hc.svg diff --git a/src/vs/base/parts/tree/browser/loading.svg b/src/sql/base/parts/tree/browser/loading.svg similarity index 100% rename from src/vs/base/parts/tree/browser/loading.svg rename to src/sql/base/parts/tree/browser/loading.svg diff --git a/src/vs/base/parts/tree/browser/tree-collapsed-dark.svg b/src/sql/base/parts/tree/browser/tree-collapsed-dark.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-collapsed-dark.svg rename to src/sql/base/parts/tree/browser/tree-collapsed-dark.svg diff --git a/src/vs/base/parts/tree/browser/tree-collapsed-hc.svg b/src/sql/base/parts/tree/browser/tree-collapsed-hc.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-collapsed-hc.svg rename to src/sql/base/parts/tree/browser/tree-collapsed-hc.svg diff --git a/src/vs/base/parts/tree/browser/tree-collapsed-light.svg b/src/sql/base/parts/tree/browser/tree-collapsed-light.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-collapsed-light.svg rename to src/sql/base/parts/tree/browser/tree-collapsed-light.svg diff --git a/src/vs/base/parts/tree/browser/tree-expanded-dark.svg b/src/sql/base/parts/tree/browser/tree-expanded-dark.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-expanded-dark.svg rename to src/sql/base/parts/tree/browser/tree-expanded-dark.svg diff --git a/src/vs/base/parts/tree/browser/tree-expanded-hc.svg b/src/sql/base/parts/tree/browser/tree-expanded-hc.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-expanded-hc.svg rename to src/sql/base/parts/tree/browser/tree-expanded-hc.svg diff --git a/src/vs/base/parts/tree/browser/tree-expanded-light.svg b/src/sql/base/parts/tree/browser/tree-expanded-light.svg similarity index 100% rename from src/vs/base/parts/tree/browser/tree-expanded-light.svg rename to src/sql/base/parts/tree/browser/tree-expanded-light.svg diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/sql/base/parts/tree/browser/tree.css similarity index 92% rename from src/vs/base/parts/tree/browser/tree.css rename to src/sql/base/parts/tree/browser/tree.css index 3f28e544ee..4e5ac5fe96 100644 --- a/src/vs/base/parts/tree/browser/tree.css +++ b/src/sql/base/parts/tree/browser/tree.css @@ -60,7 +60,6 @@ opacity: 0.3; } -/* {{SQL CARBON EDIT}} lower css settings /* Expansion */ .monaco-tree .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children > .content:before { content: ' '; @@ -77,12 +76,10 @@ background-image: url('tree-expanded-light.svg'); } -/* {{SQL CARBON EDIT}} -- Display a high-contrast arrow when an expandable item is selected and expanded */ .monaco-tree.focused .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children.selected.expanded:not(.loading) > .content:before { background-image: url('tree-expanded-hc.svg'); } -/* {{SQL CARBON EDIT}} -- Display a high-contrast arrow when an expandable item is selected and collapsed */ .monaco-tree.focused .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children.selected:not(.loading) > .content:before { background-image: url('tree-collapsed-hc.svg'); } diff --git a/src/vs/base/parts/tree/browser/tree.ts b/src/sql/base/parts/tree/browser/tree.ts similarity index 97% rename from src/vs/base/parts/tree/browser/tree.ts rename to src/sql/base/parts/tree/browser/tree.ts index aa903f5d36..491d207963 100644 --- a/src/vs/base/parts/tree/browser/tree.ts +++ b/src/sql/base/parts/tree/browser/tree.ts @@ -11,7 +11,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { Event } from 'vs/base/common/event'; import { IAction } from 'vs/base/common/actions'; import { Color } from 'vs/base/common/color'; -import { IItemCollapseEvent, IItemExpandEvent } from 'vs/base/parts/tree/browser/treeModel'; +import { IItemCollapseEvent, IItemExpandEvent } from 'sql/base/parts/tree/browser/treeModel'; import { IDragAndDropData } from 'vs/base/browser/dnd'; export interface ITree { @@ -207,7 +207,7 @@ export interface ITree { */ clearFocus(eventPayload?: any): void; - // {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 we need to refactor our code to not need these methods + // @todo anthonydresser 4/12/19 we need to refactor our code to not need these methods /** * Adds the trait to elements. */ @@ -227,7 +227,7 @@ export interface ITree { * Deselects an element. */ deselect(element: any, eventPayload?: any): void; - // {{SQL CARBON EDIT}} END + // END @todo /** * Returns a navigator which allows to discover the visible and @@ -475,14 +475,14 @@ export interface IDragOverReaction { autoExpand?: boolean; } -// {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 refactor to not need this +// @todo anthonydresser 4/12/19 refactor to not need this export const DRAG_OVER_REJECT: IDragOverReaction = { accept: false }; export const DRAG_OVER_ACCEPT: IDragOverReaction = { accept: true }; export const DRAG_OVER_ACCEPT_BUBBLE_UP: IDragOverReaction = { accept: true, bubble: DragOverBubble.BUBBLE_UP }; export const DRAG_OVER_ACCEPT_BUBBLE_DOWN = (autoExpand = false) => ({ accept: true, bubble: DragOverBubble.BUBBLE_DOWN, autoExpand }); export const DRAG_OVER_ACCEPT_BUBBLE_UP_COPY: IDragOverReaction = { accept: true, bubble: DragOverBubble.BUBBLE_UP, effect: DragOverEffect.COPY }; export const DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY = (autoExpand = false) => ({ accept: true, bubble: DragOverBubble.BUBBLE_DOWN, effect: DragOverEffect.COPY, autoExpand }); -// {{SQL CARBON EDIT}} END +// END @todo export interface IDragAndDrop { @@ -513,8 +513,6 @@ export interface IDragAndDrop { */ drop(tree: ITree, data: IDragAndDropData, targetElement: any, originalEvent: Mouse.DragMouseEvent): void; - - // {{SQL CARBON EDIT}} /** * Handles the action of canceled drag-and-drop activities */ diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/sql/base/parts/tree/browser/treeDefaults.ts similarity index 99% rename from src/vs/base/parts/tree/browser/treeDefaults.ts rename to src/sql/base/parts/tree/browser/treeDefaults.ts index 7807c8e0c6..08607cfdf8 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/src/sql/base/parts/tree/browser/treeDefaults.ts @@ -11,7 +11,7 @@ import * as errors from 'vs/base/common/errors'; import * as dom from 'vs/base/browser/dom'; import * as mouse from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import * as _ from 'vs/base/parts/tree/browser/tree'; +import * as _ from 'sql/base/parts/tree/browser/tree'; import { IDragAndDropData } from 'vs/base/browser/dnd'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { createKeybinding, Keybinding, SimpleKeybinding } from 'vs/base/common/keybindings'; @@ -450,7 +450,6 @@ export class DefaultDragAndDrop implements _.IDragAndDrop { return; } - // {{SQL CARBON EDIT}} public dropAbort(tree: _.ITree, data: IDragAndDropData): void { } } diff --git a/src/vs/base/parts/tree/browser/treeDnd.ts b/src/sql/base/parts/tree/browser/treeDnd.ts similarity index 96% rename from src/vs/base/parts/tree/browser/treeDnd.ts rename to src/sql/base/parts/tree/browser/treeDnd.ts index e1baf124ac..010aa21f0e 100644 --- a/src/vs/base/parts/tree/browser/treeDnd.ts +++ b/src/sql/base/parts/tree/browser/treeDnd.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as _ from 'vs/base/parts/tree/browser/tree'; +import * as _ from 'sql/base/parts/tree/browser/tree'; import { IDragAndDropData } from 'vs/base/browser/dnd'; export class ElementsDragAndDropData implements IDragAndDropData { @@ -70,4 +70,4 @@ export class DesktopDragAndDropData implements IDragAndDropData { files: this.files }; } -} \ No newline at end of file +} diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/sql/base/parts/tree/browser/treeImpl.ts similarity index 95% rename from src/vs/base/parts/tree/browser/treeImpl.ts rename to src/sql/base/parts/tree/browser/treeImpl.ts index d6375a99c7..8449021c1e 100644 --- a/src/vs/base/parts/tree/browser/treeImpl.ts +++ b/src/sql/base/parts/tree/browser/treeImpl.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./tree'; -import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; -import * as Model from 'vs/base/parts/tree/browser/treeModel'; +import * as TreeDefaults from 'sql/base/parts/tree/browser/treeDefaults'; +import * as Model from 'sql/base/parts/tree/browser/treeModel'; import * as View from './treeView'; -import * as _ from 'vs/base/parts/tree/browser/tree'; +import * as _ from 'sql/base/parts/tree/browser/tree'; import { INavigator, MappedNavigator } from 'sql/base/common/navigator'; import { Event, Emitter, Relay } from 'vs/base/common/event'; import { Color } from 'vs/base/common/color'; @@ -189,7 +189,6 @@ export class Tree implements _.ITree { return this.model.reveal(element, relativeTop); } - // {{SQL CARBON EDIT}} - add back deleted VS Code tree methods public getExpandedElements(): any[] { return this.model.getExpandedElements(); } @@ -212,8 +211,6 @@ export class Tree implements _.ITree { public set ariaLabel(value: string) { this.getHTMLElement().setAttribute('aria-label', value); } - // {{SQL CARBON EDIT}} - end block - public getHighlight(): any { return this.model.getHighlight(); @@ -283,7 +280,7 @@ export class Tree implements _.ITree { this.model.setFocus(null, eventPayload); } - // {{SQL CARBON EDIT}} @todo anthonydresser 4/12/19 we need to refactor our code to not need these methods + // @todo anthonydresser 4/12/19 we need to refactor our code to not need these methods public addTraits(trait: string, elements: any[]): void { this.model.addTraits(trait, elements); } @@ -299,7 +296,7 @@ export class Tree implements _.ITree { public deselect(element: any, eventPayload?: any): void { this.model.deselect(element, eventPayload); } - // {{SQL CARBON EDIT}} end + // END @todo getNavigator(fromElement?: any, subTreeOnly?: boolean): INavigator { return new MappedNavigator(this.model.getNavigator(fromElement, subTreeOnly), i => i && i.getElement()); diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/sql/base/parts/tree/browser/treeModel.ts similarity index 99% rename from src/vs/base/parts/tree/browser/treeModel.ts rename to src/sql/base/parts/tree/browser/treeModel.ts index d30de4ca8f..92d1aeda79 100644 --- a/src/vs/base/parts/tree/browser/treeModel.ts +++ b/src/sql/base/parts/tree/browser/treeModel.ts @@ -990,6 +990,7 @@ export class TreeModel { let item: Item | null; let nav = this.getNavigator(); + // eslint-disable-next-line no-cond-assign while (item = nav.next()) { elements.push(item); } @@ -1081,6 +1082,7 @@ export class TreeModel { let item: Item | null; let nav = this.getNavigator(); + // eslint-disable-next-line no-cond-assign while (item = nav.next()) { if (item.isExpanded()) { result.push(item.getElement()); @@ -1211,6 +1213,7 @@ export class TreeModel { if (selection.length === 0) { let nav = this.getNavigator(this.input); + // eslint-disable-next-line no-cond-assign while (item = nav.next()) { previousItem = item; } diff --git a/src/vs/base/parts/tree/browser/treeUtils.ts b/src/sql/base/parts/tree/browser/treeUtils.ts similarity index 81% rename from src/vs/base/parts/tree/browser/treeUtils.ts rename to src/sql/base/parts/tree/browser/treeUtils.ts index 44f05e1a3a..51ea627d7e 100644 --- a/src/vs/base/parts/tree/browser/treeUtils.ts +++ b/src/sql/base/parts/tree/browser/treeUtils.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as _ from 'vs/base/parts/tree/browser/tree'; +import * as _ from 'sql/base/parts/tree/browser/tree'; export function isEqualOrParent(tree: _.ITree, element: any, candidateParent: any): boolean { const nav = tree.getNavigator(element); @@ -12,7 +12,7 @@ export function isEqualOrParent(tree: _.ITree, element: any, candidateParent: an if (element === candidateParent) { return true; } - } while (element = nav.parent()); + } while (element = nav.parent()); // eslint-disable-line no-cond-assign return false; } diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/sql/base/parts/tree/browser/treeView.ts similarity index 98% rename from src/vs/base/parts/tree/browser/treeView.ts rename to src/sql/base/parts/tree/browser/treeView.ts index a9ac7c93a4..30d2ed8d34 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/sql/base/parts/tree/browser/treeView.ts @@ -11,19 +11,20 @@ import * as Diff from 'vs/base/common/diff/diff'; import * as Touch from 'vs/base/browser/touch'; import * as Mouse from 'vs/base/browser/mouseEvent'; import * as Keyboard from 'vs/base/browser/keyboardEvent'; -import * as Model from 'vs/base/parts/tree/browser/treeModel'; +import * as Model from 'sql/base/parts/tree/browser/treeModel'; import * as dnd from './treeDnd'; import { ArrayNavigator } from 'vs/base/common/navigator'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; -import { HeightMap, IViewItem } from 'vs/base/parts/tree/browser/treeViewModel'; -import * as _ from 'vs/base/parts/tree/browser/tree'; +import { HeightMap, IViewItem } from 'sql/base/parts/tree/browser/treeViewModel'; +import * as _ from 'sql/base/parts/tree/browser/tree'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Event, Emitter } from 'vs/base/common/event'; import { DataTransfers, StaticDND, IDragAndDropData } from 'vs/base/browser/dnd'; import { DefaultTreestyler } from './treeDefaults'; import { Delayer, timeout } from 'vs/base/common/async'; import { MappedNavigator } from 'sql/base/common/navigator'; +import { onUnexpectedError } from 'vs/base/common/errors'; export interface IRow { element: HTMLElement | null; @@ -62,8 +63,7 @@ export class RowCache implements Lifecycle.IDisposable { try { templateData = this.context.renderer!.renderTemplate(this.context.tree, templateId, content); } catch (err) { - console.error('Tree usage error: exception while rendering template'); - console.error(err); + onUnexpectedError(`Tree usage error: exception while rendering template ${err}`); } result = { @@ -154,7 +154,7 @@ export class ViewItem implements IViewItem { } set loading(value: boolean) { - value ? this.addClass('loading') : this.removeClass('loading'); // {{SQL CARBON EDIT}} Use old icons - codicon font icons aren't working currently #7715 + value ? this.addClass('loading') : this.removeClass('loading'); } set draggable(value: boolean) { @@ -270,8 +270,7 @@ export class ViewItem implements IViewItem { try { this.context.renderer!.renderElement(this.context.tree, this.model.getElement(), this.templateId, this.row!.templateData); } catch (err) { - console.error('Tree usage error: exception while rendering element'); - console.error(err); + onUnexpectedError(`Tree usage error: exception while rendering element. ${err}`); } if (this.context.horizontalScrolling) { @@ -311,7 +310,7 @@ export class ViewItem implements IViewItem { try { container.insertBefore(this.element, afterElement); } catch (e) { - console.warn('Failed to locate previous tree element'); + onUnexpectedError('Failed to locate previous tree element'); container.appendChild(this.element); } } @@ -409,7 +408,7 @@ export class TreeView extends HeightMap { private treeStyler: _.ITreeStyler; private rowsContainer: HTMLElement; private scrollableElement: ScrollableElement; - // @ts-expect-error {{SQL CARBON EDIT}} This always errored - ignoring for now unless we find it impacting something + // @ts-expect-error This always errored - ignoring for now unless we find it impacting something private msGesture: MSGesture | undefined; private lastPointerType: string = ''; @@ -602,7 +601,7 @@ export class TreeView extends HeightMap { private setupMSGesture(): void { if ((window).MSGesture) { - // @ts-expect-error {{SQL CARBON EDIT}} This always errored - ignoring for now unless we find it impacting something + // @ts-expect-error This always errored - ignoring for now unless we find it impacting something this.msGesture = new MSGesture(); setTimeout(() => this.msGesture!.target = this.wrapper, 100); // TODO@joh, TODO@IETeam } @@ -857,6 +856,7 @@ export class TreeView extends HeightMap { let navigator = item.getNavigator(); let childItem: Model.Item | null; + // eslint-disable-next-line no-cond-assign while (childItem = navigator.next()) { childrenIds.push(childItem.id); } @@ -884,6 +884,7 @@ export class TreeView extends HeightMap { let navigator = item.getNavigator(); let childItem: Model.Item | null; + // eslint-disable-next-line no-cond-assign while (childItem = navigator.next()) { afterModelItems.push(childItem); } @@ -1456,6 +1457,7 @@ export class TreeView extends HeightMap { if (reaction!.bubble === _.DragOverBubble.BUBBLE_DOWN) { let nav = item.getNavigator(); let child: Model.Item | null; + // eslint-disable-next-line no-cond-assign while (child = nav.next()) { viewItem = this.items[child.id]; if (viewItem) { @@ -1487,7 +1489,6 @@ export class TreeView extends HeightMap { this.context.dnd!.drop(this.context.tree, this.currentDragAndDropData!, this.currentDropElement, event); this.onDragEnd(e); } else { - // {{SQL CARBON EDIT}} this.context.dnd!.dropAbort(this.context.tree, this.currentDragAndDropData!); } this.cancelDragAndDropScrollInterval(); @@ -1498,7 +1499,6 @@ export class TreeView extends HeightMap { this.currentDropTargets!.forEach(i => i.dropTarget = false); this.currentDropTargets = []; } else { - // {{SQL CARBON EDIT}} this.context.dnd!.dropAbort(this.context.tree, this.currentDragAndDropData!); } @@ -1573,7 +1573,7 @@ export class TreeView extends HeightMap { if (el === this.scrollableElement.getDomNode() || el === document.body) { return undefined; } - } while (el = el.parentElement); + } while (el = el.parentElement); // eslint-disable-line no-cond-assign return undefined; } diff --git a/src/vs/base/parts/tree/browser/treeViewModel.ts b/src/sql/base/parts/tree/browser/treeViewModel.ts similarity index 94% rename from src/vs/base/parts/tree/browser/treeViewModel.ts rename to src/sql/base/parts/tree/browser/treeViewModel.ts index 434a790254..98efb01ea1 100644 --- a/src/vs/base/parts/tree/browser/treeViewModel.ts +++ b/src/sql/base/parts/tree/browser/treeViewModel.ts @@ -3,6 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import { onUnexpectedError } from 'vs/base/common/errors'; import { ArrayNavigator, INavigator } from 'vs/base/common/navigator'; import { Item } from './treeModel'; @@ -38,7 +39,7 @@ export class HeightMap { viewItem = this.heightMap[i - 1]; if (!viewItem) { - console.error('view item doesnt exist'); + onUnexpectedError('view item doesn\'t exist'); return undefined; } @@ -48,6 +49,7 @@ export class HeightMap { const startingIndex = i; let itemsToInsert: IViewItem[] = []; + // eslint-disable-next-line no-cond-assign while (item = iterator.next()) { viewItem = this.createViewItem(item); viewItem.top = totalSize + sizeDiff; @@ -88,12 +90,13 @@ export class HeightMap { let i = 0; let sizeDiff = 0; + // eslint-disable-next-line no-cond-assign while (itemId = iterator.next()) { i = this.indexes[itemId]; viewItem = this.heightMap[i]; if (!viewItem) { - console.error('view item doesnt exist'); + onUnexpectedError('view item doesn\'t exist'); return; } @@ -137,6 +140,7 @@ export class HeightMap { let i: number, j: number | null = null; let cummDiff = 0; + // eslint-disable-next-line no-cond-assign while (item = iterator.next()) { i = this.indexes[item.id]; diff --git a/src/vs/base/parts/tree/test/browser/treeModel.test.ts b/src/sql/base/parts/tree/test/browser/treeModel.test.ts similarity index 99% rename from src/vs/base/parts/tree/test/browser/treeModel.test.ts rename to src/sql/base/parts/tree/test/browser/treeModel.test.ts index 0840abed1d..aed4eaf69b 100644 --- a/src/vs/base/parts/tree/test/browser/treeModel.test.ts +++ b/src/sql/base/parts/tree/test/browser/treeModel.test.ts @@ -5,9 +5,9 @@ import * as assert from 'assert'; import * as lifecycle from 'vs/base/common/lifecycle'; -import * as _ from 'vs/base/parts/tree/browser/tree'; -import * as model from 'vs/base/parts/tree/browser/treeModel'; -import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; +import * as _ from 'sql/base/parts/tree/browser/tree'; +import * as model from 'sql/base/parts/tree/browser/treeModel'; +import * as TreeDefaults from 'sql/base/parts/tree/browser/treeDefaults'; import { Event, Emitter } from 'vs/base/common/event'; import { timeout } from 'vs/base/common/async'; diff --git a/src/vs/base/parts/tree/test/browser/treeViewModel.test.ts b/src/sql/base/parts/tree/test/browser/treeViewModel.test.ts similarity index 99% rename from src/vs/base/parts/tree/test/browser/treeViewModel.test.ts rename to src/sql/base/parts/tree/test/browser/treeViewModel.test.ts index 9db57a6948..262a51e335 100644 --- a/src/vs/base/parts/tree/test/browser/treeViewModel.test.ts +++ b/src/sql/base/parts/tree/test/browser/treeViewModel.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { ArrayNavigator } from 'vs/base/common/navigator'; -import { HeightMap, IViewItem } from 'vs/base/parts/tree/browser/treeViewModel'; +import { HeightMap, IViewItem } from 'sql/base/parts/tree/browser/treeViewModel'; function makeItem(id: any, height: any): any { return { diff --git a/src/sql/workbench/browser/modelComponents/tree.component.ts b/src/sql/workbench/browser/modelComponents/tree.component.ts index 6df0f2a92d..544847890a 100644 --- a/src/sql/workbench/browser/modelComponents/tree.component.ts +++ b/src/sql/workbench/browser/modelComponents/tree.component.ts @@ -12,11 +12,11 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { TreeComponentRenderer } from 'sql/workbench/browser/modelComponents/treeComponentRenderer'; import { TreeComponentDataSource } from 'sql/workbench/browser/modelComponents/treeDataSource'; import { attachListStyler } from 'vs/platform/theme/common/styler'; -import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; +import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'sql/base/parts/tree/browser/treeDefaults'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITreeComponentItem } from 'sql/workbench/common/views'; import { TreeViewDataProvider } from 'sql/workbench/browser/modelComponents/treeViewDataProvider'; diff --git a/src/sql/workbench/browser/modelComponents/treeComponentRenderer.ts b/src/sql/workbench/browser/modelComponents/treeComponentRenderer.ts index 2b1567737c..d583562746 100644 --- a/src/sql/workbench/browser/modelComponents/treeComponentRenderer.ts +++ b/src/sql/workbench/browser/modelComponents/treeComponentRenderer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as dom from 'vs/base/browser/dom'; -import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IRenderer } from 'sql/base/parts/tree/browser/tree'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Disposable } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/browser/modelComponents/treeDataSource.ts b/src/sql/workbench/browser/modelComponents/treeDataSource.ts index b783740077..8aca5d6261 100644 --- a/src/sql/workbench/browser/modelComponents/treeDataSource.ts +++ b/src/sql/workbench/browser/modelComponents/treeDataSource.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDataSource } from 'sql/base/parts/tree/browser/tree'; import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views'; import { TreeItemCollapsibleState } from 'vs/workbench/common/views'; @@ -56,4 +56,4 @@ export class TreeComponentDataSource implements IDataSource { public shouldAutoexpand(tree: ITree, node: ITreeComponentItem): boolean { return node.collapsibleState === TreeItemCollapsibleState.Expanded; } -} \ No newline at end of file +} diff --git a/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts b/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts index e45e38c257..6824d624bb 100644 --- a/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts @@ -19,7 +19,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ILogService } from 'vs/platform/log/common/log'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { AsyncServerTree } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree'; export class ConnectionViewletPanel extends ViewPane { diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts index 1108806267..5a82d89455 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts @@ -23,7 +23,7 @@ import { import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts b/src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts index 84d455e671..999824df05 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as tree from 'vs/base/parts/tree/browser/tree'; -import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; +import * as tree from 'sql/base/parts/tree/browser/tree'; +import * as TreeDefaults from 'sql/base/parts/tree/browser/treeDefaults'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts index 5583372318..cbab8711ce 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, forwardRef, ElementRef, ViewChild, AfterContentChecked } from '@angular/core'; import { attachListStyler } from 'vs/platform/theme/common/styler'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts b/src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts index cb06c81ac7..1090ecbfbe 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts @@ -5,8 +5,8 @@ import * as DOM from 'vs/base/browser/dom'; -import * as tree from 'vs/base/parts/tree/browser/tree'; -import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; +import * as tree from 'sql/base/parts/tree/browser/tree'; +import * as TreeDefaults from 'sql/base/parts/tree/browser/treeDefaults'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { generateUuid } from 'vs/base/common/uuid'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; diff --git a/src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts index ca0ec2bc1b..55817b2f8e 100644 --- a/src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts @@ -9,7 +9,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati import Severity from 'vs/base/common/severity'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachButtonStyler, attachListStyler } from 'vs/platform/theme/common/styler'; -import { ISelectionEvent, ITree } from 'vs/base/parts/tree/browser/tree'; +import { ISelectionEvent, ITree } from 'sql/base/parts/tree/browser/tree'; import { Disposable } from 'vs/base/common/lifecycle'; import { localize } from 'vs/nls'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts b/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts index 302d4cc49f..7992972ac2 100644 --- a/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts +++ b/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts @@ -35,7 +35,7 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe import { TestAccessibilityService, TestListService } from 'vs/workbench/test/browser/workbenchTestServices'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; import { ServerTreeDataSource } from 'sql/workbench/services/objectExplorer/browser/serverTreeDataSource'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { AsyncServerTree } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree'; import { ConsoleLogger, LogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts index 0a8a38215f..25f9b571d1 100644 --- a/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts +++ b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts @@ -9,7 +9,7 @@ import { ConnectionManagementService } from 'sql/workbench/services/connection/b import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import * as TypeMoq from 'typemoq'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { TestTree } from 'sql/workbench/test/treeMock'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts index 88f9489798..028bf0cf2f 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/services/tasks/common/tasksNode'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksController.ts b/src/sql/workbench/contrib/tasks/browser/tasksController.ts index f2bac831c4..c0cdf18609 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksController.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksController.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; -import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults'; +import { ITree, ContextMenuEvent } from 'sql/base/parts/tree/browser/tree'; +import * as treedefaults from 'sql/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts b/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts index da97c360e8..04dba43480 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDataSource } from 'sql/base/parts/tree/browser/tree'; import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode'; /** diff --git a/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts b/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts index c264cc3e6e..7ff3437abe 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IRenderer } from 'sql/base/parts/tree/browser/tree'; import { TaskNode, TaskStatus } from 'sql/workbench/services/tasks/common/tasksNode'; import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksView.ts b/src/sql/workbench/contrib/tasks/browser/tasksView.ts index 55c7f425e8..66052173be 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksView.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksView.ts @@ -7,11 +7,11 @@ import 'vs/css!./media/tasksPanel'; import * as errors from 'vs/base/common/errors'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import Severity from 'vs/base/common/severity'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; -import { DefaultFilter, DefaultDragAndDrop, DefaultAccessibilityProvider } from 'vs/base/parts/tree/browser/treeDefaults'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; +import { DefaultFilter, DefaultDragAndDrop, DefaultAccessibilityProvider } from 'sql/base/parts/tree/browser/treeDefaults'; import { localize } from 'vs/nls'; import { hide, $, append } from 'vs/base/browser/dom'; import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane'; diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index 2ffb78dc08..f5c60bdf29 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -35,10 +35,10 @@ import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; import { IConnectionProfile } from 'azdata'; import { TreeUpdateUtils } from 'sql/workbench/services/objectExplorer/browser/treeUpdateUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults'; +import { ICancelableEvent } from 'sql/base/parts/tree/browser/treeDefaults'; import { RecentConnectionActionsProvider, RecentConnectionTreeController } from 'sql/workbench/services/connection/browser/recentConnectionTreeController'; import { ClearRecentConnectionsAction } from 'sql/workbench/services/connection/browser/connectionActions'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { AsyncServerTree } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ConnectionBrowseTab } from 'sql/workbench/services/connection/browser/connectionBrowseTab'; diff --git a/src/sql/workbench/services/connection/browser/recentConnectionTreeController.ts b/src/sql/workbench/services/connection/browser/recentConnectionTreeController.ts index 85b6da54ca..28d48b385b 100644 --- a/src/sql/workbench/services/connection/browser/recentConnectionTreeController.ts +++ b/src/sql/workbench/services/connection/browser/recentConnectionTreeController.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults'; +import { DefaultController, ICancelableEvent } from 'sql/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { ClearSingleRecentConnectionAction } from 'sql/workbench/services/connection/browser/connectionActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts index b82c6b5d0d..85fbbadcd8 100644 --- a/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts +++ b/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts @@ -115,6 +115,7 @@ suite('ConnectionDialogService tests', () => { mockConnectionManagementService.setup(x => x.getConnectionGroups(TypeMoq.It.isAny())).returns(() => { return [new ConnectionProfileGroup('test_group', undefined, 'test_group')]; }); + mockConnectionManagementService.setup(x => x.getConnectionIconId(TypeMoq.It.isAnyString())).returns(() => ''); mockConnectionManagementService.setup(x => x.getProviderProperties(TypeMoq.It.isAny())).returns(() => { return { connectionStringOptions: { @@ -177,6 +178,7 @@ suite('ConnectionDialogService tests', () => { mockConnectionManagementService.setup(x => x.addSavedPassword(TypeMoq.It.isAny())).returns(() => { return Promise.resolve(connectionProfile); }); + mockConnectionManagementService.setup(x => x.isConnected(undefined, TypeMoq.It.isAny())).returns(() => true); mockWidget = TypeMoq.Mock.ofType(ConnectionWidget, TypeMoq.MockBehavior.Strict, [], undefined, 'MSSQL', undefined, undefined, mockConnectionManagementService.object); mockWidget.setup(x => x.focusOnOpen()); mockWidget.setup(x => x.handleOnConnecting()); diff --git a/src/sql/workbench/services/connection/test/browser/connectionDialogWidget.test.ts b/src/sql/workbench/services/connection/test/browser/connectionDialogWidget.test.ts index a349e9c2ff..c354331920 100644 --- a/src/sql/workbench/services/connection/test/browser/connectionDialogWidget.test.ts +++ b/src/sql/workbench/services/connection/test/browser/connectionDialogWidget.test.ts @@ -18,7 +18,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; import { entries } from 'sql/base/common/collections'; import { TestLayoutService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices'; -import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; +import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { NullAdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { createConnectionProfile } from 'sql/workbench/services/connection/test/browser/connectionManagementService.test'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; @@ -63,6 +63,10 @@ suite('ConnectionDialogWidget tests', () => { undefined, // telemetry service undefined, // configuration service new TestCapabilitiesService()); + mockConnectionManagementService.setup(x => x.isConnected(undefined, TypeMoq.It.isAny())).returns(() => true); + mockConnectionManagementService.setup(x => x.getConnectionIconId(TypeMoq.It.isAnyString())).returns(() => ''); + mockConnectionManagementService.setup(x => x.getProviderProperties(TypeMoq.It.isAnyString())).returns(() => undefined); + cmInstantiationService.stub(IConnectionManagementService, mockConnectionManagementService.object); let providerDisplayNames = ['Mock SQL Server']; let providerNameToDisplayMap = { 'MSSQL': 'Mock SQL Server' }; connectionDialogWidget = new TestConnectionDialogWidget(providerDisplayNames, providerNameToDisplayMap['MSSQL'], providerNameToDisplayMap, cmInstantiationService, mockConnectionManagementService.object, undefined, undefined, viewDescriptorService, new TestThemeService(), new TestLayoutService(), new NullAdsTelemetryService(), new MockContextKeyService(), undefined, new NullLogService(), new TestTextResourcePropertiesService(new TestConfigurationService()), new TestConfigurationService(), new TestCapabilitiesService()); diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts index d59ad52ea2..6d65c59d8f 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree } from 'vs/base/parts/tree/browser/tree'; -import treedefaults = require('vs/base/parts/tree/browser/treeDefaults'); +import { ITree } from 'sql/base/parts/tree/browser/tree'; +import treedefaults = require('sql/base/parts/tree/browser/treeDefaults'); import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts index dde87a20eb..df9177b17f 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts @@ -5,7 +5,7 @@ import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; -import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDataSource } from 'sql/base/parts/tree/browser/tree'; /** * Implements the DataSource(that returns a parent/children of an element) for the file browser diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts index b4bf2b59b0..233c0a5e92 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; -import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IRenderer } from 'sql/base/parts/tree/browser/tree'; import { FileKind } from 'vs/platform/files/common/files'; import { URI } from 'vs/base/common/uri'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts index b54496cff1..7aa93421ce 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts @@ -10,12 +10,12 @@ import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/i import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import nls = require('vs/nls'); -import { DefaultFilter, DefaultAccessibilityProvider, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { DefaultFilter, DefaultAccessibilityProvider, DefaultDragAndDrop } from 'sql/base/parts/tree/browser/treeDefaults'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { IExpandableTree } from 'sql/workbench/services/objectExplorer/browser/treeUpdateUtils'; /** diff --git a/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts b/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts index 0ac0cf63dd..635b5dfa71 100644 --- a/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts +++ b/src/sql/workbench/services/objectExplorer/browser/connectionTreeAction.ts @@ -9,7 +9,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { IObjectExplorerService, ServerTreeViewView } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeNode } from 'sql/workbench/services/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/workbench/services/objectExplorer/browser/dragAndDropController.ts b/src/sql/workbench/services/objectExplorer/browser/dragAndDropController.ts index a3c3dd0080..c2393eb828 100644 --- a/src/sql/workbench/services/objectExplorer/browser/dragAndDropController.ts +++ b/src/sql/workbench/services/objectExplorer/browser/dragAndDropController.ts @@ -6,7 +6,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ITree, IDragAndDrop, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDragAndDrop, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'sql/base/parts/tree/browser/tree'; import { DragMouseEvent } from 'vs/base/browser/mouseEvent'; import { TreeUpdateUtils } from 'sql/workbench/services/objectExplorer/browser/treeUpdateUtils'; import { UNSAVED_GROUP_ID, mssqlProviderName, pgsqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts index 3898b0eb6b..eddff9c71b 100644 --- a/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts +++ b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts @@ -20,7 +20,7 @@ import { entries } from 'sql/base/common/collections'; import { values } from 'vs/base/common/collections'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { ServerTreeActionProvider } from 'sql/workbench/services/objectExplorer/browser/serverTreeActionProvider'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { AsyncServerTree, ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser/asyncServerTree'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/services/objectExplorer/browser/recentConnectionDataSource.ts b/src/sql/workbench/services/objectExplorer/browser/recentConnectionDataSource.ts index e12700c7e7..6ccc966289 100644 --- a/src/sql/workbench/services/objectExplorer/browser/recentConnectionDataSource.ts +++ b/src/sql/workbench/services/objectExplorer/browser/recentConnectionDataSource.ts @@ -5,7 +5,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDataSource } from 'sql/base/parts/tree/browser/tree'; /** * Implements the DataSource(that returns a parent/children of an element) for the recent connection tree diff --git a/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts b/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts index f70c74718d..6f4a15771f 100644 --- a/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts +++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeActionProvider.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { IAction, Separator } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/services/objectExplorer/browser/serverTreeController.ts b/src/sql/workbench/services/objectExplorer/browser/serverTreeController.ts index 3bd2f22fef..60417da062 100644 --- a/src/sql/workbench/services/objectExplorer/browser/serverTreeController.ts +++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeController.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; -import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults'; +import { ITree, ContextMenuEvent } from 'sql/base/parts/tree/browser/tree'; +import * as treedefaults from 'sql/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; diff --git a/src/sql/workbench/services/objectExplorer/browser/serverTreeDataSource.ts b/src/sql/workbench/services/objectExplorer/browser/serverTreeDataSource.ts index ebcbdb6876..989218b147 100644 --- a/src/sql/workbench/services/objectExplorer/browser/serverTreeDataSource.ts +++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeDataSource.ts @@ -5,7 +5,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IDataSource } from 'sql/base/parts/tree/browser/tree'; import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/services/objectExplorer/common/treeNode'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeUpdateUtils } from 'sql/workbench/services/objectExplorer/browser/treeUpdateUtils'; diff --git a/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts b/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts index cfb81faab8..2231826fba 100644 --- a/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts +++ b/src/sql/workbench/services/objectExplorer/browser/serverTreeRenderer.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/objectTypes/objecttypes'; import * as dom from 'vs/base/browser/dom'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; +import { ITree, IRenderer } from 'sql/base/parts/tree/browser/tree'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TreeNode } from 'sql/workbench/services/objectExplorer/common/treeNode'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; diff --git a/src/sql/workbench/services/objectExplorer/browser/treeCreationUtils.ts b/src/sql/workbench/services/objectExplorer/browser/treeCreationUtils.ts index 140600cd40..661077466e 100644 --- a/src/sql/workbench/services/objectExplorer/browser/treeCreationUtils.ts +++ b/src/sql/workbench/services/objectExplorer/browser/treeCreationUtils.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vs/nls'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ServerTreeRenderer } from 'sql/workbench/services/objectExplorer/browser/serverTreeRenderer'; import { ServerTreeDataSource } from 'sql/workbench/services/objectExplorer/browser/serverTreeDataSource'; import { ServerTreeController } from 'sql/workbench/services/objectExplorer/browser/serverTreeController'; import { ServerTreeActionProvider } from 'sql/workbench/services/objectExplorer/browser/serverTreeActionProvider'; -import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; -import { IController } from 'vs/base/parts/tree/browser/tree'; +import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'sql/base/parts/tree/browser/treeDefaults'; +import { IController } from 'sql/base/parts/tree/browser/tree'; import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/workbench/services/objectExplorer/browser/dragAndDropController'; import { RecentConnectionDataSource } from 'sql/workbench/services/objectExplorer/browser/recentConnectionDataSource'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; diff --git a/src/sql/workbench/services/objectExplorer/browser/treeSelectionHandler.ts b/src/sql/workbench/services/objectExplorer/browser/treeSelectionHandler.ts index ee1d125469..109962eae0 100644 --- a/src/sql/workbench/services/objectExplorer/browser/treeSelectionHandler.ts +++ b/src/sql/workbench/services/objectExplorer/browser/treeSelectionHandler.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; diff --git a/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts b/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts index e8912c3969..340a05762e 100644 --- a/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts +++ b/src/sql/workbench/services/objectExplorer/browser/treeUpdateUtils.ts @@ -5,7 +5,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/platform/connection/common/connectionManagement'; -import { ITree } from 'vs/base/parts/tree/browser/tree'; +import { ITree } from 'sql/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { NodeType } from 'sql/workbench/services/objectExplorer/common/nodeType'; diff --git a/src/sql/workbench/services/profiler/browser/profilerColumnEditorDialog.ts b/src/sql/workbench/services/profiler/browser/profilerColumnEditorDialog.ts index 36631b8d68..a28ddd7dac 100644 --- a/src/sql/workbench/services/profiler/browser/profilerColumnEditorDialog.ts +++ b/src/sql/workbench/services/profiler/browser/profilerColumnEditorDialog.ts @@ -14,10 +14,10 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { Tree } from 'sql/base/parts/tree/browser/treeImpl'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import * as DOM from 'vs/base/browser/dom'; -import { IDataSource, ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; +import { IDataSource, ITree, IRenderer } from 'sql/base/parts/tree/browser/tree'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Event, Emitter } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/test/treeMock.ts b/src/sql/workbench/test/treeMock.ts index 395424736d..158bd57291 100644 --- a/src/sql/workbench/test/treeMock.ts +++ b/src/sql/workbench/test/treeMock.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { Event } from 'vs/base/common/event'; import { INavigator } from 'sql/base/common/navigator'; -import { ITree, IHighlightEvent, ISelectionEvent, IFocusEvent, ITreeStyles } from 'vs/base/parts/tree/browser/tree'; -import { IItemExpandEvent, IItemCollapseEvent } from 'vs/base/parts/tree/browser/treeModel'; +import { ITree, IHighlightEvent, ISelectionEvent, IFocusEvent, ITreeStyles } from 'sql/base/parts/tree/browser/tree'; +import { IItemExpandEvent, IItemCollapseEvent } from 'sql/base/parts/tree/browser/treeModel'; /** * A basic implementation of ITree to use for testing diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index 474f3c62d0..8a79924297 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -54,7 +54,7 @@ "sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts", "sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts", "sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.ts", - "vs/base/parts/tree/browser/treeDefaults.ts" + "sql/base/parts/tree/browser/treeDefaults.ts" ], "ban-script-content-assignments": [ "sql/workbench/services/notebook/browser/outputs/renderers.ts"