Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -4,8 +4,8 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { nb } from 'sqlops';
import { TreeItem } from 'vs/workbench/api/node/extHostTypes';
import { nb, IConnectionProfile } from 'sqlops';
import * as vsExtTypes from 'vs/workbench/api/node/extHostTypes';
// SQL added extension host types
export enum ServiceOptionType {
@@ -315,7 +315,8 @@ export interface ToolbarLayout {
orientation: Orientation;
}
export class TreeComponentItem extends TreeItem {
export class TreeComponentItem extends vsExtTypes.TreeItem {
label?: string;
checked?: boolean;
}
@@ -324,6 +325,12 @@ export enum AzureResource {
Sql = 1
}
export class TreeItem extends vsExtTypes.TreeItem {
label?: string;
payload: IConnectionProfile;
providerHandle: string;
}
export interface ServerInfoOption {
isBigDataCluster: boolean;
clusterEndpoints: ClusterEndpoint;