Fixes #1856 Object Explorer needs Icons field for nodes separate from… (#1901)

* Fixes #1856 Object Explorer needs Icons field for nodes separate from type/subtype
- Adds in the concept of a themeable icon path which matches VSCode's implementation. This should help support theme-based overrides in the future

src/sql/parts/objectExplorer/common/nodeType.ts

@@ -95,3 +95,7 @@ export class NodeType {
 	public static ColumnMasterKey = 'ColumnMasterKey';
 	public static ColumnEncryptionKey = 'ColumnEncryptionKey';
 }
+
+export interface SqlThemeIcon {
+	readonly id: string;
+}

src/sql/parts/objectExplorer/common/objectExplorerService.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
-import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/objectExplorer/common/treeNode';
+import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -20,7 +20,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { warn, error } from 'sql/base/common/log';
 import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView';
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
-import * as vscode from 'vscode';
 
 export const SERVICE_ID = 'ObjectExplorerService';
 
@@ -402,7 +401,7 @@ export class ObjectExplorerService implements IObjectExplorerService {
 		}
 
 		return new TreeNode(nodeInfo.nodeType, nodeInfo.label, isLeaf, nodeInfo.nodePath,
-			nodeInfo.nodeSubType, nodeInfo.nodeStatus, parent, nodeInfo.metadata, {
+			nodeInfo.nodeSubType, nodeInfo.nodeStatus, parent, nodeInfo.metadata, nodeInfo.iconType, {
 				getChildren: treeNode => this.getChildren(treeNode),
 				isExpanded: treeNode => this.isExpanded(treeNode),
 				setNodeExpandedState: (treeNode, expandedState) => this.setNodeExpandedState(treeNode, expandedState),

src/sql/parts/objectExplorer/common/treeNode.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
-import { NodeType } from 'sql/parts/objectExplorer/common/nodeType';
+import { NodeType, SqlThemeIcon } from 'sql/parts/objectExplorer/common/nodeType';
 import * as sqlops from 'sqlops';
 
 import * as UUID from 'vs/base/common/uuid';
@@ -83,6 +83,23 @@ export class TreeNode {
 
 	public metadata: sqlops.ObjectMetadata;
 
+	public iconType: string | SqlThemeIcon;
+
+	constructor(nodeTypeId: string, label: string, isAlwaysLeaf: boolean, nodePath: string,
+		nodeSubType: string, nodeStatus: string, parent: TreeNode, metadata: sqlops.ObjectMetadata,
+		iconType: string | SqlThemeIcon,
+		private _objectExplorerCallbacks: ObjectExplorerCallbacks) {
+		this.nodeTypeId = nodeTypeId;
+		this.label = label;
+		this.isAlwaysLeaf = isAlwaysLeaf;
+		this.nodePath = nodePath;
+		this.parent = parent;
+		this.metadata = metadata;
+		this.iconType = iconType;
+		this.id = UUID.generateUuid();
+		this.nodeSubType = nodeSubType;
+		this.nodeStatus = nodeStatus;
+	}
 	public getConnectionProfile(): ConnectionProfile {
 		var currentNode: TreeNode = this;
 		while (!currentNode.connection && currentNode.parent) {
@@ -149,18 +166,4 @@ export class TreeNode {
 	public setSelected(selected: boolean, clearOtherSelections?: boolean): Thenable<void> {
 		return this._objectExplorerCallbacks.setNodeSelected(this, selected, clearOtherSelections);
 	}
-
-	constructor(nodeTypeId: string, label: string, isAlwaysLeaf: boolean, nodePath: string,
-		nodeSubType: string, nodeStatus: string, parent: TreeNode, metadata: sqlops.ObjectMetadata,
-		private _objectExplorerCallbacks: ObjectExplorerCallbacks) {
-		this.nodeTypeId = nodeTypeId;
-		this.label = label;
-		this.isAlwaysLeaf = isAlwaysLeaf;
-		this.nodePath = nodePath;
-		this.parent = parent;
-		this.metadata = metadata;
-		this.id = UUID.generateUuid();
-		this.nodeSubType = nodeSubType;
-		this.nodeStatus = nodeStatus;
-	}
 }

src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts

@@ -105,38 +105,45 @@ export class ServerTreeRenderer implements IRenderer {
 	 */
 	public renderElement(tree: ITree, element: any, templateId: string, templateData: any): void {
 		if (templateId === ServerTreeRenderer.CONNECTION_TEMPLATE_ID) {
-			this.renderConnection(tree, element, templateData);
+			this.renderConnection(element, templateData);
 		} else if (templateId === ServerTreeRenderer.CONNECTION_GROUP_TEMPLATE_ID) {
-			this.renderConnectionProfileGroup(tree, element, templateData);
+			this.renderConnectionProfileGroup(element, templateData);
 		} else {
-			this.renderObjectExplorer(tree, element, templateData);
+			this.renderObjectExplorer(element, templateData);
 		}
 	}
 
-	private renderObjectExplorer(tree: ITree, treeNode: TreeNode, templateData: IObjectExplorerTemplateData): void {
+	private renderObjectExplorer(treeNode: TreeNode, templateData: IObjectExplorerTemplateData): void {
-		var iconName = treeNode.nodeTypeId;
+		// Use an explicitly defined iconType first. If not defined, fall back to using nodeType and
+		// other compount indicators instead.
+		let iconName: string = undefined;
+		if (treeNode.iconType) {
+			iconName = (typeof treeNode.iconType === 'string') ? treeNode.iconType : treeNode.iconType.id;
+		} else {
+			iconName = treeNode.nodeTypeId;
 			if (treeNode.nodeStatus) {
 				iconName = treeNode.nodeTypeId + '_' + treeNode.nodeStatus;
 			}
 			if (treeNode.nodeSubType) {
 				iconName = treeNode.nodeTypeId + '_' + treeNode.nodeSubType;
 			}
+		}
 
 		let tokens: string[] = [];
-		for (var index = 1; index < templateData.icon.classList.length; index++) {
+		for (let index = 1; index < templateData.icon.classList.length; index++) {
 			tokens.push(templateData.icon.classList.item(index));
 		}
 		templateData.icon.classList.remove(...tokens);
 		templateData.icon.classList.add('icon');
-		let iconLoweCaseName = iconName.toLocaleLowerCase();
+		let iconLowerCaseName = iconName.toLocaleLowerCase();
-		templateData.icon.classList.add(iconLoweCaseName);
+		templateData.icon.classList.add(iconLowerCaseName);
 
 		templateData.label.textContent = treeNode.label;
 		templateData.root.title = treeNode.label;
 	}
 
 
-	private renderConnection(tree: ITree, connection: ConnectionProfile, templateData: IConnectionTemplateData): void {
+	private renderConnection(connection: ConnectionProfile, templateData: IConnectionTemplateData): void {
 		if (!this._isCompact) {
 			if (this._connectionManagementService.isConnected(undefined, connection)) {
 				templateData.icon.classList.remove('disconnected');
@@ -157,9 +164,9 @@ export class ServerTreeRenderer implements IRenderer {
 		templateData.connectionProfile = connection;
 	}
 
-	private renderConnectionProfileGroup(tree: ITree, connectionProfileGroup: ConnectionProfileGroup, templateData: IConnectionProfileGroupTemplateData): void {
+	private renderConnectionProfileGroup(connectionProfileGroup: ConnectionProfileGroup, templateData: IConnectionProfileGroupTemplateData): void {
 
-		var rowElement = this.findParentElement(templateData.root, 'monaco-tree-row');
+		let rowElement = this.findParentElement(templateData.root, 'monaco-tree-row');
 		if (rowElement) {
 			if (connectionProfileGroup.color) {
 				rowElement.style.background = connectionProfileGroup.color;
@@ -179,7 +186,7 @@ export class ServerTreeRenderer implements IRenderer {
 	 * Returns the first parent which contains the className
 	 */
 	private findParentElement(container: HTMLElement, className: string): HTMLElement {
-		var currentElement = container;
+		let currentElement = container;
 		while (currentElement) {
 			if (currentElement.className.includes(className)) {
 				break;

src/sql/sqlops.d.ts

@@ -928,6 +928,10 @@ declare module 'sqlops' {
 		subset: EditRow[];
 	}
 
+	/**
+	 * A NodeInfo object represents an element in the Object Explorer tree under
+	 * a connection.
+	 */
 	export interface NodeInfo {
 		nodePath: string;
 		nodeType: string;
@@ -937,6 +941,116 @@ declare module 'sqlops' {
 		isLeaf: boolean;
 		metadata: ObjectMetadata;
 		errorMessage: string;
+		/**
+		 * Optional iconType for the object in the tree. Currently this only supports
+		 * an icon name or SqlThemeIcon name, rather than a path to an icon.
+		 * If not defined, the nodeType + nodeStatus / nodeSubType values
+		 * will be used instead.
+		 */
+		iconType?: string | SqlThemeIcon;
+	}
+
+	/**
+	 * A reference to a named icon. Currently only a subset of the SQL icons are available.
+	 * Using a theme icon is preferred over a custom icon as it gives theme authors the possibility to change the icons.
+	 */
+	export class SqlThemeIcon {
+		static readonly Folder: SqlThemeIcon;
+		static readonly Root: SqlThemeIcon;
+		static readonly Database: SqlThemeIcon;
+		static readonly Server: SqlThemeIcon;
+		static readonly ScalarValuedFunction: SqlThemeIcon;
+		static readonly TableValuedFunction: SqlThemeIcon;
+		static readonly AggregateFunction: SqlThemeIcon;
+		static readonly FileGroup: SqlThemeIcon;
+		static readonly StoredProcedure: SqlThemeIcon;
+		static readonly UserDefinedTableType: SqlThemeIcon;
+		static readonly View: SqlThemeIcon;
+		static readonly Table: SqlThemeIcon;
+		static readonly HistoryTable: SqlThemeIcon;
+		static readonly ServerLevelLinkedServerLogin: SqlThemeIcon;
+		static readonly ServerLevelServerAudit: SqlThemeIcon;
+		static readonly ServerLevelCryptographicProvider: SqlThemeIcon;
+		static readonly ServerLevelCredential: SqlThemeIcon;
+		static readonly ServerLevelServerRole: SqlThemeIcon;
+		static readonly ServerLevelLogin: SqlThemeIcon;
+		static readonly ServerLevelServerAuditSpecification: SqlThemeIcon;
+		static readonly ServerLevelServerTrigger: SqlThemeIcon;
+		static readonly ServerLevelLinkedServer: SqlThemeIcon;
+		static readonly ServerLevelEndpoint: SqlThemeIcon;
+		static readonly Synonym: SqlThemeIcon;
+		static readonly DatabaseTrigger: SqlThemeIcon;
+		static readonly Assembly: SqlThemeIcon;
+		static readonly MessageType: SqlThemeIcon;
+		static readonly Contract: SqlThemeIcon;
+		static readonly Queue: SqlThemeIcon;
+		static readonly Service: SqlThemeIcon;
+		static readonly Route: SqlThemeIcon;
+		static readonly DatabaseAndQueueEventNotification: SqlThemeIcon;
+		static readonly RemoteServiceBinding: SqlThemeIcon;
+		static readonly BrokerPriority: SqlThemeIcon;
+		static readonly FullTextCatalog: SqlThemeIcon;
+		static readonly FullTextStopList: SqlThemeIcon;
+		static readonly SqlLogFile: SqlThemeIcon;
+		static readonly PartitionFunction: SqlThemeIcon;
+		static readonly PartitionScheme: SqlThemeIcon;
+		static readonly SearchPropertyList: SqlThemeIcon;
+		static readonly User: SqlThemeIcon;
+		static readonly Schema: SqlThemeIcon;
+		static readonly AsymmetricKey: SqlThemeIcon;
+		static readonly Certificate: SqlThemeIcon;
+		static readonly SymmetricKey: SqlThemeIcon;
+		static readonly DatabaseEncryptionKey: SqlThemeIcon;
+		static readonly MasterKey: SqlThemeIcon;
+		static readonly DatabaseAuditSpecification: SqlThemeIcon;
+		static readonly Column: SqlThemeIcon;
+		static readonly Key: SqlThemeIcon;
+		static readonly Constraint: SqlThemeIcon;
+		static readonly Trigger: SqlThemeIcon;
+		static readonly Index: SqlThemeIcon;
+		static readonly Statistic: SqlThemeIcon;
+		static readonly UserDefinedDataType: SqlThemeIcon;
+		static readonly UserDefinedType: SqlThemeIcon;
+		static readonly XmlSchemaCollection: SqlThemeIcon;
+		static readonly SystemExactNumeric: SqlThemeIcon;
+		static readonly SystemApproximateNumeric: SqlThemeIcon;
+		static readonly SystemDateAndTime: SqlThemeIcon;
+		static readonly SystemCharacterString: SqlThemeIcon;
+		static readonly SystemUnicodeCharacterString: SqlThemeIcon;
+		static readonly SystemBinaryString: SqlThemeIcon;
+		static readonly SystemOtherDataType: SqlThemeIcon;
+		static readonly SystemClrDataType: SqlThemeIcon;
+		static readonly SystemSpatialDataType: SqlThemeIcon;
+		static readonly UserDefinedTableTypeColumn: SqlThemeIcon;
+		static readonly UserDefinedTableTypeKey: SqlThemeIcon;
+		static readonly UserDefinedTableTypeConstraint: SqlThemeIcon;
+		static readonly StoredProcedureParameter: SqlThemeIcon;
+		static readonly TableValuedFunctionParameter: SqlThemeIcon;
+		static readonly ScalarValuedFunctionParameter: SqlThemeIcon;
+		static readonly AggregateFunctionParameter: SqlThemeIcon;
+		static readonly DatabaseRole: SqlThemeIcon;
+		static readonly ApplicationRole: SqlThemeIcon;
+		static readonly FileGroupFile: SqlThemeIcon;
+		static readonly SystemMessageType: SqlThemeIcon;
+		static readonly SystemContract: SqlThemeIcon;
+		static readonly SystemService: SqlThemeIcon;
+		static readonly SystemQueue: SqlThemeIcon;
+		static readonly Sequence: SqlThemeIcon;
+		static readonly SecurityPolicy: SqlThemeIcon;
+		static readonly DatabaseScopedCredential: SqlThemeIcon;
+		static readonly ExternalResource: SqlThemeIcon;
+		static readonly ExternalDataSource: SqlThemeIcon;
+		static readonly ExternalFileFormat: SqlThemeIcon;
+		static readonly ExternalTable: SqlThemeIcon;
+		static readonly ColumnMasterKey: SqlThemeIcon;
+		static readonly ColumnEncryptionKey: SqlThemeIcon;
+
+		private constructor(id: string);
+
+		/**
+		 * Gets the ID for the theme icon for help in cases where string comparison is needed
+		 */
+		public readonly id: string;
 	}
 
 	// Object Explorer interfaces  -----------------------------------------------------------------------

src/sql/workbench/api/common/sqlExtHostTypes.ts

@@ -278,3 +278,101 @@ export enum CardType {
 	VerticalButton  = 'VerticalButton',
 	Details = 'Details'
 }
+export class SqlThemeIcon {
+
+	static readonly Folder = new SqlThemeIcon('Folder');
+	static readonly Root = new SqlThemeIcon('root');
+	static readonly Database = new SqlThemeIcon('Database');
+	static readonly Server = new SqlThemeIcon('Server');
+	static readonly ScalarValuedFunction = new SqlThemeIcon('ScalarValuedFunction');
+	static readonly TableValuedFunction = new SqlThemeIcon('TableValuedFunction');
+	static readonly AggregateFunction = new SqlThemeIcon('AggregateFunction');
+	static readonly FileGroup = new SqlThemeIcon('FileGroup');
+	static readonly StoredProcedure = new SqlThemeIcon('StoredProcedure');
+	static readonly UserDefinedTableType = new SqlThemeIcon('UserDefinedTableType');
+	static readonly View = new SqlThemeIcon('View');
+	static readonly Table = new SqlThemeIcon('Table');
+	static readonly HistoryTable = new SqlThemeIcon('HistoryTable');
+	static readonly ServerLevelLinkedServerLogin = new SqlThemeIcon('ServerLevelLinkedServerLogin');
+	static readonly ServerLevelServerAudit = new SqlThemeIcon('ServerLevelServerAudit');
+	static readonly ServerLevelCryptographicProvider = new SqlThemeIcon('ServerLevelCryptographicProvider');
+	static readonly ServerLevelCredential = new SqlThemeIcon('ServerLevelCredential');
+	static readonly ServerLevelServerRole = new SqlThemeIcon('ServerLevelServerRole');
+	static readonly ServerLevelLogin = new SqlThemeIcon('ServerLevelLogin');
+	static readonly ServerLevelServerAuditSpecification = new SqlThemeIcon('ServerLevelServerAuditSpecification');
+	static readonly ServerLevelServerTrigger = new SqlThemeIcon('ServerLevelServerTrigger');
+	static readonly ServerLevelLinkedServer = new SqlThemeIcon('ServerLevelLinkedServer');
+	static readonly ServerLevelEndpoint = new SqlThemeIcon('ServerLevelEndpoint');
+	static readonly Synonym = new SqlThemeIcon('Synonym');
+	static readonly DatabaseTrigger = new SqlThemeIcon('DatabaseTrigger');
+	static readonly Assembly = new SqlThemeIcon('Assembly');
+	static readonly MessageType = new SqlThemeIcon('MessageType');
+	static readonly Contract = new SqlThemeIcon('Contract');
+	static readonly Queue = new SqlThemeIcon('Queue');
+	static readonly Service = new SqlThemeIcon('Service');
+	static readonly Route = new SqlThemeIcon('Route');
+	static readonly DatabaseAndQueueEventNotification = new SqlThemeIcon('DatabaseAndQueueEventNotification');
+	static readonly RemoteServiceBinding = new SqlThemeIcon('RemoteServiceBinding');
+	static readonly BrokerPriority = new SqlThemeIcon('BrokerPriority');
+	static readonly FullTextCatalog = new SqlThemeIcon('FullTextCatalog');
+	static readonly FullTextStopList = new SqlThemeIcon('FullTextStopList');
+	static readonly SqlLogFile = new SqlThemeIcon('SqlLogFile');
+	static readonly PartitionFunction = new SqlThemeIcon('PartitionFunction');
+	static readonly PartitionScheme = new SqlThemeIcon('PartitionScheme');
+	static readonly SearchPropertyList = new SqlThemeIcon('SearchPropertyList');
+	static readonly User = new SqlThemeIcon('User');
+	static readonly Schema = new SqlThemeIcon('Schema');
+	static readonly AsymmetricKey = new SqlThemeIcon('AsymmetricKey');
+	static readonly Certificate = new SqlThemeIcon('Certificate');
+	static readonly SymmetricKey = new SqlThemeIcon('SymmetricKey');
+	static readonly DatabaseEncryptionKey = new SqlThemeIcon('DatabaseEncryptionKey');
+	static readonly MasterKey = new SqlThemeIcon('MasterKey');
+	static readonly DatabaseAuditSpecification = new SqlThemeIcon('DatabaseAuditSpecification');
+	static readonly Column = new SqlThemeIcon('Column');
+	static readonly Key = new SqlThemeIcon('Key');
+	static readonly Constraint = new SqlThemeIcon('Constraint');
+	static readonly Trigger = new SqlThemeIcon('Trigger');
+	static readonly Index = new SqlThemeIcon('Index');
+	static readonly Statistic = new SqlThemeIcon('Statistic');
+	static readonly UserDefinedDataType = new SqlThemeIcon('UserDefinedDataType');
+	static readonly UserDefinedType = new SqlThemeIcon('UserDefinedType');
+	static readonly XmlSchemaCollection = new SqlThemeIcon('XmlSchemaCollection');
+	static readonly SystemExactNumeric = new SqlThemeIcon('SystemExactNumeric');
+	static readonly SystemApproximateNumeric = new SqlThemeIcon('SystemApproximateNumeric');
+	static readonly SystemDateAndTime = new SqlThemeIcon('SystemDateAndTime');
+	static readonly SystemCharacterString = new SqlThemeIcon('SystemCharacterString');
+	static readonly SystemUnicodeCharacterString = new SqlThemeIcon('SystemUnicodeCharacterString');
+	static readonly SystemBinaryString = new SqlThemeIcon('SystemBinaryString');
+	static readonly SystemOtherDataType = new SqlThemeIcon('SystemOtherDataType');
+	static readonly SystemClrDataType = new SqlThemeIcon('SystemClrDataType');
+	static readonly SystemSpatialDataType = new SqlThemeIcon('SystemSpatialDataType');
+	static readonly UserDefinedTableTypeColumn = new SqlThemeIcon('UserDefinedTableTypeColumn');
+	static readonly UserDefinedTableTypeKey = new SqlThemeIcon('UserDefinedTableTypeKey');
+	static readonly UserDefinedTableTypeConstraint = new SqlThemeIcon('UserDefinedTableTypeConstraint');
+	static readonly StoredProcedureParameter = new SqlThemeIcon('StoredProcedureParameter');
+	static readonly TableValuedFunctionParameter = new SqlThemeIcon('TableValuedFunctionParameter');
+	static readonly ScalarValuedFunctionParameter = new SqlThemeIcon('ScalarValuedFunctionParameter');
+	static readonly AggregateFunctionParameter = new SqlThemeIcon('AggregateFunctionParameter');
+	static readonly DatabaseRole = new SqlThemeIcon('DatabaseRole');
+	static readonly ApplicationRole = new SqlThemeIcon('ApplicationRole');
+	static readonly FileGroupFile = new SqlThemeIcon('FileGroupFile');
+	static readonly SystemMessageType = new SqlThemeIcon('SystemMessageType');
+	static readonly SystemContract = new SqlThemeIcon('SystemContract');
+	static readonly SystemService = new SqlThemeIcon('SystemService');
+	static readonly SystemQueue = new SqlThemeIcon('SystemQueue');
+	static readonly Sequence = new SqlThemeIcon('Sequence');
+	static readonly SecurityPolicy = new SqlThemeIcon('SecurityPolicy');
+	static readonly DatabaseScopedCredential = new SqlThemeIcon('DatabaseScopedCredential');
+	static readonly ExternalResource = new SqlThemeIcon('ExternalResource');
+	static readonly ExternalDataSource = new SqlThemeIcon('ExternalDataSource');
+	static readonly ExternalFileFormat = new SqlThemeIcon('ExternalFileFormat');
+	static readonly ExternalTable = new SqlThemeIcon('ExternalTable');
+	static readonly ColumnMasterKey = new SqlThemeIcon('ColumnMasterKey');
+	static readonly ColumnEncryptionKey = new SqlThemeIcon('ColumnEncryptionKey');
+
+	public readonly id: string;
+
+	private constructor(id: string) {
+		this.id = id;
+	}
+}

src/sql/workbench/api/node/sqlExtHost.api.impl.ts

@@ -400,7 +400,8 @@ export function createApiFactory(
 				queryeditor: queryEditor,
 				ui: ui,
 				StatusIndicator: sqlExtHostTypes.StatusIndicator,
-				CardType: sqlExtHostTypes.CardType
+				CardType: sqlExtHostTypes.CardType,
+				SqlThemeIcon: sqlExtHostTypes.SqlThemeIcon
 			};
 		}
 	};

src/sqltest/parts/connection/connectionTreeActions.test.ts

@@ -74,8 +74,8 @@ suite('SQL Connection Tree Action tests', () => {
 		let objectExplorerService = TypeMoq.Mock.ofType(ObjectExplorerService, TypeMoq.MockBehavior.Strict, connectionManagementService);
 		objectExplorerService.callBase = true;
 		objectExplorerService.setup(x => x.getTreeNode(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(getTreeNodeReturnVal));
-		objectExplorerService.setup(x => x.getObjectExplorerNode(TypeMoq.It.isAny())).returns(() => new TreeNode('', '', false, '', '', '', undefined, undefined, undefined));
+		objectExplorerService.setup(x => x.getObjectExplorerNode(TypeMoq.It.isAny())).returns(() => new TreeNode('', '', false, '', '', '', undefined, undefined, undefined, undefined));
-		objectExplorerService.setup(x => x.getObjectExplorerNode(undefined)).returns(() => new TreeNode('', '', false, '', '', '', undefined, undefined, undefined));
+		objectExplorerService.setup(x => x.getObjectExplorerNode(undefined)).returns(() => new TreeNode('', '', false, '', '', '', undefined, undefined, undefined, undefined));
 		objectExplorerService.setup(x => x.onUpdateObjectExplorerNodes).returns(() => new Emitter<ObjectExplorerNodeEventArgs>().event);
 
 		objectExplorerService.setup(x => x.onUpdateObjectExplorerNodes).returns(() => new Emitter<ObjectExplorerNodeEventArgs>().event);
@@ -137,7 +137,7 @@ suite('SQL Connection Tree Action tests', () => {
 			saveProfile: true,
 			id: 'testId'
 		});
-		let treeNode = new TreeNode(NodeType.Database, 'db node', false, '', '', '', undefined, undefined, undefined);
+		let treeNode = new TreeNode(NodeType.Database, 'db node', false, '', '', '', undefined, undefined, undefined, undefined);
 		treeNode.connection = connection;
 		let connectionManagementService = createConnectionManagementService(isConnectedReturnValue, connection);
 		let objectExplorerService = createObjectExplorerService(connectionManagementService.object, treeNode);
@@ -398,11 +398,11 @@ suite('SQL Connection Tree Action tests', () => {
 			errorMessage: ''
 		};
 
-		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\Db1\tables', '', '', null, null, undefined);
+		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\Db1\tables', '', '', null, null, undefined, undefined);
 		tablesNode.connection = connection;
 		tablesNode.session = objectExplorerSession;
-		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined);
+		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined, undefined);
-		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined);
+		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined, undefined);
 		tablesNode.children = [table1Node, table2Node];
 		let objectExplorerService = TypeMoq.Mock.ofType(ObjectExplorerService, TypeMoq.MockBehavior.Loose, connectionManagementService.object);
 		objectExplorerService.callBase = true;
@@ -486,11 +486,11 @@ suite('SQL Connection Tree Action tests', () => {
 			errorMessage: ''
 		};
 
-		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\Db1\tables', '', '', null, null, undefined);
+		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\Db1\tables', '', '', null, null, undefined, undefined);
 		tablesNode.connection = connection;
 		tablesNode.session = objectExplorerSession;
-		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined);
+		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined, undefined);
-		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined);
+		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\tables\dbo.Table1', '', '', tablesNode, null, undefined, undefined);
 		tablesNode.children = [table1Node, table2Node];
 		let objectExplorerService = TypeMoq.Mock.ofType(ObjectExplorerService, TypeMoq.MockBehavior.Loose, connectionManagementService.object);
 		objectExplorerService.callBase = true;

src/sqltest/parts/connection/objectExplorerService.test.ts

@@ -371,7 +371,7 @@ suite('SQL Object Explorer Service tests', () => {
 	});
 
 	test('expand tree node should get correct children', (done) => {
-		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName/tables', '', '', null, null, undefined);
+		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName/tables', '', '', null, null, undefined, undefined);
 		tablesNode.connection = connection;
 		objectExplorerService.createNewSession('MSSQL', connection).then(result => {
 			objectExplorerService.onSessionCreated(1, objectExplorerSession);
@@ -392,7 +392,7 @@ suite('SQL Object Explorer Service tests', () => {
 	});
 
 	test('refresh tree node should children correctly', (done) => {
-		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName/tables', '', '', null, null, undefined);
+		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName/tables', '', '', null, null, undefined, undefined);
 		tablesNode.connection = connection;
 		objectExplorerService.createNewSession('MSSQL', connection).then(result => {
 			objectExplorerService.onSessionCreated(1, objectExplorerSession);
@@ -455,13 +455,13 @@ suite('SQL Object Explorer Service tests', () => {
 			name: 'Db1',
 			schema: null
 		};
-		var databaseNode = new TreeNode(NodeType.Database, 'Db1', false, 'testServerName\\Db1', '', '', null, databaseMetaData, undefined);
+		var databaseNode = new TreeNode(NodeType.Database, 'Db1', false, 'testServerName\\Db1', '', '', null, databaseMetaData, undefined, undefined);
 		databaseNode.connection = connection;
 		databaseNode.session = objectExplorerSession;
-		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\\Db1\\tables', '', '', databaseNode, null, undefined);
+		var tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\\Db1\\tables', '', '', databaseNode, null, undefined, undefined);
 		databaseNode.children = [tablesNode];
-		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\\Db1\\tables\\dbo.Table1', '', '', tablesNode, null, undefined);
+		var table1Node = new TreeNode(NodeType.Table, 'dbo.Table1', false, 'testServerName\\Db1\\tables\\dbo.Table1', '', '', tablesNode, null, undefined, undefined);
-		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table2', false, 'testServerName\\Db1\\tables\\dbo.Table2', '', '', tablesNode, null, undefined);
+		var table2Node = new TreeNode(NodeType.Table, 'dbo.Table2', false, 'testServerName\\Db1\\tables\\dbo.Table2', '', '', tablesNode, null, undefined, undefined);
 		tablesNode.children = [table1Node, table2Node];
 		assert.equal(table1Node.getSession(), objectExplorerSession);
 		assert.equal(table1Node.getConnectionProfile(), connection);
@@ -480,7 +480,7 @@ suite('SQL Object Explorer Service tests', () => {
 
 	test('getSelectedProfileAndDatabase returns the profile but no database if children of a server are selected', () => {
 		let serverTreeView = TypeMoq.Mock.ofInstance({ getSelection: () => undefined, onSelectionOrFocusChange: Event.None } as ServerTreeView);
-		let databaseNode = new TreeNode(NodeType.Folder, 'Folder1', false, 'testServerName\\Folder1', '', '', undefined, undefined, undefined);
+		let databaseNode = new TreeNode(NodeType.Folder, 'Folder1', false, 'testServerName\\Folder1', '', '', undefined, undefined, undefined, undefined);
 		databaseNode.connection = connection;
 		serverTreeView.setup(x => x.getSelection()).returns(() => [databaseNode]);
 		objectExplorerService.registerServerTreeView(serverTreeView.object);
@@ -500,8 +500,8 @@ suite('SQL Object Explorer Service tests', () => {
 			schema: undefined
 		};
 		let databaseName = 'Db1';
-		let databaseNode = new TreeNode(NodeType.Database, databaseName, false, 'testServerName\\Db1', '', '', undefined, databaseMetadata, undefined);
+		let databaseNode = new TreeNode(NodeType.Database, databaseName, false, 'testServerName\\Db1', '', '', undefined, databaseMetadata, undefined, undefined);
-		let tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\\Db1\\tables', '', '', databaseNode, undefined, undefined);
+		let tablesNode = new TreeNode(NodeType.Folder, 'Tables', false, 'testServerName\\Db1\\tables', '', '', databaseNode, undefined, undefined, undefined);
 		databaseNode.connection = connection;
 		databaseNode.children = [tablesNode];
 		serverTreeView.setup(x => x.getSelection()).returns(() => [tablesNode]);