Another code layering (#4037)

* working on formatting

* fixed basic lint errors; starting moving things to their appropriate location

* formatting

* update tslint to match the version of vscode we have

* remove unused code

* work in progress fixing layering

* formatting

* moved connection management service to platform

* formatting

* add missing file

* moving more servies

* formatting

* moving more services

* formatting

* wip

* moving more services

* formatting

* move css file

* add missing svgs

* moved the rest of services

* formatting

* changing around some references

* formatting

* revert tslint

* revert some changes that brake things

* formatting

* fix tests

* fix testzx

* fix tests

* fix tests

* fix compile issue

src/sql/platform/accountManagement/browser/accountPicker.ts

@@ -21,7 +21,7 @@ import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 
 import * as sqlops from 'sqlops';
 import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList';
-import { attachDropdownStyler } from 'sql/common/theme/styler';
+import { attachDropdownStyler } from 'sql/platform/theme/common/styler';
 import { AddAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions';
 import { AccountPickerListRenderer, AccountListDelegate } from 'sql/parts/accountManagement/common/accountListRenderer';
 import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel';

src/sql/platform/backup/common/backupService.ts

@@ -6,11 +6,8 @@
 'use strict';
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { Event } from 'vs/base/common/event';
 import * as sqlops from 'sqlops';
 
-import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-
 export enum TaskExecutionMode {
 	execute = 0,
 	script = 1,
@@ -18,33 +15,6 @@ export enum TaskExecutionMode {
 }
 
 export const SERVICE_ID = 'backupService';
-export const UI_SERVICE_ID = 'backupUiService';
-
-export const IBackupUiService = createDecorator<IBackupUiService>(UI_SERVICE_ID);
-
-export interface IBackupUiService {
-	_serviceBrand: any;
-
-	/**
-	 * Show backup wizard
-	 */
-	showBackup(connection: IConnectionProfile): Promise<any>;
-
-	/**
-	 * On show backup event
-	 */
-	onShowBackupEvent: Event<{ connection: IConnectionProfile, ownerUri: string }>;
-
-	/**
-	 * Close backup wizard
-	 */
-	closeBackup();
-
-	/**
-	 * After the backup dialog is rendered, run Modal methods to set focusable elements, etc.
-	 */
-	onShowBackupDialog();
-}
 
 export const IBackupService = createDecorator<IBackupService>(SERVICE_ID);
 

src/sql/platform/connection/common/connectionManagement.ts

@@ -279,29 +279,6 @@ export interface IConnectionManagementService {
 	getConnectionProfileById(profileId: string): IConnectionProfile;
 }
 
-export const IConnectionDialogService = createDecorator<IConnectionDialogService>('connectionDialogService');
-export interface IConnectionDialogService {
-	_serviceBrand: any;
-	/**
-	 * Opens the connection dialog and returns the promise for successfully opening the dialog
-	 * @param connectionManagementService
-	 * @param params
-	 * @param model
-	 * @param connectionResult
-	 */
-	showDialog(connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): Thenable<void>;
-
-	/**
-	 * Opens the connection dialog and returns the promise when connection is made
-	 * or dialog is closed
-	 * @param connectionManagementService
-	 * @param params
-	 * @param model
-	 * @param connectionResult
-	 */
-	openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable<IConnectionProfile>;
-}
-
 export enum RunQueryOnConnectionMode {
 	none = 0,
 	executeQuery = 1,

src/sql/platform/connection/common/connectionManagementService.ts

@@ -7,7 +7,7 @@
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
 import {
-	IConnectionManagementService, IConnectionDialogService, INewConnectionParams,
+	IConnectionManagementService, INewConnectionParams,
 	ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionCallbacks,
 	IConnectionParams, IConnectionResult, RunQueryOnConnectionMode
 } from 'sql/platform/connection/common/connectionManagement';
@@ -46,7 +46,6 @@ import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/commo
 import * as platform from 'vs/platform/registry/common/platform';
 import { Memento } from 'vs/workbench/common/memento';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService';
@@ -56,9 +55,8 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
 import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
 import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
 
 export class ConnectionManagementService extends Disposable implements IConnectionManagementService {
 
@@ -84,13 +82,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 	constructor(
 		private _connectionMemento: Memento,
 		private _connectionStore: ConnectionStore,
+		@IStorageService _storageService: IStorageService,
 		@IConnectionDialogService private _connectionDialogService: IConnectionDialogService,
 		@IServerGroupController private _serverGroupController: IServerGroupController,
-		@ICommandService private _commandService: ICommandService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IEditorService private _editorService: IEditorService,
-		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
-		@IStorageService private _storageService: IStorageService,
 		@ITelemetryService private _telemetryService: ITelemetryService,
 		@IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService,
 		@ICredentialsService private _credentialsService: ICredentialsService,
@@ -99,7 +95,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
 		@IStatusbarService private _statusBarService: IStatusbarService,
 		@IResourceProviderService private _resourceProviderService: IResourceProviderService,
-		@IViewletService private _viewletService: IViewletService,
 		@IAngularEventingService private _angularEventing: IAngularEventingService,
 		@IAccountManagementService private _accountManagementService: IAccountManagementService
 	) {

src/sql/platform/dialog/customDialogService.ts

@@ -6,11 +6,11 @@
 'use strict';
 
 import * as sqlops from 'sqlops';
-import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog';
+import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
 import { DialogModal } from 'sql/platform/dialog/dialogModal';
 import { WizardModal } from 'sql/platform/dialog/wizardModal';
 import { Dialog, Wizard, DialogTab } from 'sql/platform/dialog/dialogTypes';
-import { IModalOptions } from 'sql/base/browser/ui/modal/modal';
+import { IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 const defaultOptions: IModalOptions = { hasBackButton: false, isWide: false, hasErrors: true };

src/sql/platform/dialog/dialogModal.ts

@@ -6,8 +6,8 @@
 'use strict';
 
 import 'vs/css!./media/dialogModal';
-import { Modal, IModalOptions } from 'sql/base/browser/ui/modal/modal';
-import { attachModalDialogStyler } from 'sql/common/theme/styler';
+import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
+import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import { Dialog, DialogButton } from 'sql/platform/dialog/dialogTypes';
 import { DialogPane } from 'sql/platform/dialog/dialogPane';
 

src/sql/platform/dialog/dialogPane.ts

@@ -9,7 +9,7 @@ import 'vs/css!./media/dialogModal';
 
 import { NgModuleRef } from '@angular/core';
 
-import { IModalDialogStyles } from 'sql/base/browser/ui/modal/modal';
+import { IModalDialogStyles } from 'sql/workbench/browser/modal/modal';
 import { DialogTab } from 'sql/platform/dialog/dialogTypes';
 import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel';
 import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';

src/sql/platform/dialog/wizardModal.ts

@@ -6,8 +6,8 @@
 'use strict';
 
 import 'vs/css!./media/dialogModal';
-import { Modal, IModalOptions } from 'sql/base/browser/ui/modal/modal';
-import { attachModalDialogStyler } from 'sql/common/theme/styler';
+import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
+import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
 import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/dialogTypes';
 import { DialogPane } from 'sql/platform/dialog/dialogPane';
 import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';

src/sql/platform/fileBrowser/common/fileBrowserService.ts

@@ -7,8 +7,8 @@
 
 import * as sqlops from 'sqlops';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
-import { FileBrowserTree } from 'sql/parts/fileBrowser/common/fileBrowserTree';
-import { FileNode } from 'sql/parts/fileBrowser/common/fileNode';
+import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree';
+import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
 import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces';
 import * as Constants from 'sql/common/constants';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';

src/sql/platform/fileBrowser/common/interfaces.ts

@@ -6,25 +6,11 @@
 'use strict';
 
 import * as sqlops from 'sqlops';
-import { FileBrowserTree } from 'sql/parts/fileBrowser/common/fileBrowserTree';
-import { FileNode } from 'sql/parts/fileBrowser/common/fileNode';
+import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree';
+import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
 import { Event } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
-export const IFileBrowserDialogController = createDecorator<IFileBrowserDialogController>('fileBrowserDialogService');
-export interface IFileBrowserDialogController {
-	_serviceBrand: any;
-	/**
-	 * Show file browser dialog
-	 */
-	showDialog(ownerUri: string,
-		expandPath: string,
-		fileFilters: { label: string, filters: string[] }[],
-		fileValidationServiceType: string,
-		isWide: boolean,
-		handleOnOk: (path: string) => void): void;
-}
-
 export const IFileBrowserService = createDecorator<IFileBrowserService>('fileBrowserService');
 export interface IFileBrowserService {
 	_serviceBrand: any;

src/sql/platform/restore/common/restoreServiceImpl.ts

@@ -13,14 +13,14 @@ import * as sqlops from 'sqlops';
 
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService';
-import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog';
+import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
 import { RestoreDialog } from 'sql/parts/disasterRecovery/restore/restoreDialog';
 import * as ConnectionConstants from 'sql/platform/connection/common/constants';
 import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo';
 import * as Utils from 'sql/platform/connection/common/utils';
-import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService';
+import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { ITaskService } from 'sql/platform/taskHistory/common/taskService';
 import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode';
 import * as Constants from 'sql/common/constants';

src/sql/platform/taskHistory/common/taskService.ts

@@ -6,7 +6,7 @@
 'use strict';
 import * as sqlops from 'sqlops';
 import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode';
-import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
+import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';

src/sql/platform/telemetry/fileTelemetryService.ts

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { ITelemetryService, ITelemetryInfo, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
-const fs = require('fs');
-
-/**
- * Write telemetry into a file for test purposes
- */
-export class FileTelemetryService implements ITelemetryService {
-	_serviceBrand: undefined;
-	private _isFirst = true;
-
-	constructor(private _outputFile: string) {
-	}
-
-	publicLog(eventName: string, data?: ITelemetryData) {
-		let telemetryData = JSON.stringify(Object.assign({ eventName: eventName, data: data }));
-		if (this._outputFile) {
-			if (this._isFirst) {
-				fs.open(this._outputFile, fs.O_WRONLY | fs.O_CREAT, (err, fr) => {
-					fs.writeFileSync(this._outputFile, telemetryData + '\n');
-					this._isFirst = false;
-				});
-			} else {
-				fs.appendFileSync(this._outputFile, telemetryData + '\n');
-			}
-		}
-		return TPromise.wrap<void>(null);
-	}
-	isOptedIn: true;
-	getTelemetryInfo(): TPromise<ITelemetryInfo> {
-		return TPromise.wrap({
-			instanceId: 'someValue.instanceId',
-			sessionId: 'someValue.sessionId',
-			machineId: 'someValue.machineId'
-		});
-	}
-}

src/sql/platform/theme/common/colors.ts

@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerColor, foreground } from 'vs/platform/theme/common/colorRegistry';
+import { Color, RGBA } from 'vs/base/common/color';
+import * as nls from 'vs/nls';
+
+export const tableHeaderBackground = registerColor('table.headerBackground', { dark: new Color(new RGBA(51, 51, 52)), light: new Color(new RGBA(245, 245, 245)), hc: '#333334' }, nls.localize('tableHeaderBackground', 'Table header background color'));
+export const tableHeaderForeground = registerColor('table.headerForeground', { dark: new Color(new RGBA(229, 229, 229)), light: new Color(new RGBA(16, 16, 16)), hc: '#e5e5e5' }, nls.localize('tableHeaderForeground', 'Table header foreground color'));
+export const disabledInputBackground = registerColor('input.disabled.background', { dark: '#444444', light: '#dcdcdc', hc: Color.black }, nls.localize('disabledInputBoxBackground', "Disabled Input box background."));
+export const disabledInputForeground = registerColor('input.disabled.foreground', { dark: '#888888', light: '#888888', hc: foreground }, nls.localize('disabledInputBoxForeground', "Disabled Input box foreground."));
+export const buttonFocusOutline = registerColor('button.focusOutline', { dark: '#eaeaea', light: '#666666', hc: null }, nls.localize('buttonFocusOutline', "Button outline color when focused."));
+export const disabledCheckboxForeground = registerColor('checkbox.disabled.foreground', { dark: '#888888', light: '#888888', hc: Color.black }, nls.localize('disabledCheckboxforeground', "Disabled checkbox foreground."));
+
+export const listFocusAndSelectionBackground = registerColor('list.focusAndSelectionBackground', { dark: '#2c3295', light: '#2c3295', hc: null }, nls.localize('listFocusAndSelectionBackground', "List/Table background color for the selected and focus item when the list/table is active"));
+
+// SQL Agent Colors
+export const tableBackground = registerColor('agent.tableBackground', { light: '#fffffe', dark: '#333333', hc: Color.black }, nls.localize('agentTableBackground', "SQL Agent Table background color."));
+export const cellBackground = registerColor('agent.cellBackground', { light: '#faf5f8', dark: Color.black, hc: Color.black }, nls.localize('agentCellBackground', "SQL Agent table cell background color."));
+export const tableHoverBackground = registerColor('agent.tableHoverColor', { light: '#dcdcdc', dark: '#444444', hc: null }, nls.localize('agentTableHoverBackground', "SQL Agent table hover background color."));
+export const jobsHeadingBackground = registerColor('agent.jobsHeadingColor', { light: '#f4f4f4', dark: '#444444', hc: '#2b56f2' }, nls.localize('agentJobsHeadingColor', "SQL Agent heading background color."));
+export const cellBorderColor = registerColor('agent.cellBorderColor', { light: null, dark: null, hc: '#2b56f2' }, nls.localize('agentCellBorderColor', "SQL Agent table cell border color."));

src/sql/platform/theme/common/styler.ts

@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as sqlcolors from './colors';
+
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import * as cr from 'vs/platform/theme/common/colorRegistry';
+import { IThemable, attachStyler } from 'vs/platform/theme/common/styler';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
+import { IPanelColors } from 'vs/workbench/browser/parts/views/panelViewlet';
+
+export function attachModalDialogStyler(widget: IThemable, themeService: IThemeService, style?:
+	{
+		dialogForeground?: cr.ColorIdentifier,
+		dialogHeaderAndFooterBackground?: cr.ColorIdentifier,
+		dialogBodyBackground?: cr.ColorIdentifier,
+	}): IDisposable {
+	return attachStyler(themeService, {
+		dialogForeground: (style && style.dialogForeground) || cr.foreground,
+		dialogBorder: cr.contrastBorder,
+		dialogHeaderAndFooterBackground: (style && style.dialogHeaderAndFooterBackground) || SIDE_BAR_BACKGROUND,
+		dialogBodyBackground: (style && style.dialogBodyBackground) || cr.editorBackground
+	}, widget);
+}
+
+export function attachDropdownStyler(widget: IThemable, themeService: IThemeService, style?:
+	{
+		backgroundColor?: cr.ColorIdentifier,
+		foregroundColor?: cr.ColorIdentifier,
+		borderColor?: cr.ColorIdentifier,
+	}): IDisposable {
+	return attachStyler(themeService, {
+		foregroundColor: (style && style.foregroundColor) || cr.inputForeground,
+		borderColor: (style && style.borderColor) || cr.inputBorder,
+		backgroundColor: (style && style.backgroundColor) || cr.editorBackground
+	}, widget);
+}
+
+export function attachInputBoxStyler(widget: IThemable, themeService: IThemeService, style?:
+	{
+		inputBackground?: cr.ColorIdentifier,
+		inputForeground?: cr.ColorIdentifier,
+		disabledInputBackground?: cr.ColorIdentifier,
+		disabledInputForeground?: cr.ColorIdentifier,
+		inputBorder?: cr.ColorIdentifier,
+		inputValidationInfoBorder?: cr.ColorIdentifier,
+		inputValidationInfoBackground?: cr.ColorIdentifier,
+		inputValidationWarningBorder?: cr.ColorIdentifier,
+		inputValidationWarningBackground?: cr.ColorIdentifier,
+		inputValidationErrorBorder?: cr.ColorIdentifier,
+		inputValidationErrorBackground?: cr.ColorIdentifier
+	}): IDisposable {
+	return attachStyler(themeService, {
+		inputBackground: (style && style.inputBackground) || cr.inputBackground,
+		inputForeground: (style && style.inputForeground) || cr.inputForeground,
+		disabledInputBackground: (style && style.disabledInputBackground) || sqlcolors.disabledInputBackground,
+		disabledInputForeground: (style && style.disabledInputForeground) || sqlcolors.disabledInputForeground,
+		inputBorder: (style && style.inputBorder) || cr.inputBorder,
+		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || cr.inputValidationInfoBorder,
+		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || cr.inputValidationInfoBackground,
+		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || cr.inputValidationWarningBorder,
+		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || cr.inputValidationWarningBackground,
+		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || cr.inputValidationErrorBorder,
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || cr.inputValidationErrorBackground
+	}, widget);
+}
+
+export function attachSelectBoxStyler(widget: IThemable, themeService: IThemeService, style?:
+	{
+		selectBackground?: cr.ColorIdentifier,
+		selectListBackground?: cr.ColorIdentifier,
+		selectForeground?: cr.ColorIdentifier,
+		selectBorder?: cr.ColorIdentifier,
+		disabledSelectBackground?: cr.ColorIdentifier,
+		disabledSelectForeground?: cr.ColorIdentifier,
+		inputValidationInfoBorder?: cr.ColorIdentifier,
+		inputValidationInfoBackground?: cr.ColorIdentifier,
+		inputValidationWarningBorder?: cr.ColorIdentifier,
+		inputValidationWarningBackground?: cr.ColorIdentifier,
+		inputValidationErrorBorder?: cr.ColorIdentifier,
+		inputValidationErrorBackground?: cr.ColorIdentifier,
+		focusBorder?: cr.ColorIdentifier,
+		listFocusBackground?: cr.ColorIdentifier,
+		listFocusForeground?: cr.ColorIdentifier,
+		listFocusOutline?: cr.ColorIdentifier,
+		listHoverBackground?: cr.ColorIdentifier,
+		listHoverForeground?: cr.ColorIdentifier
+	}): IDisposable {
+	return attachStyler(themeService, {
+		selectBackground: (style && style.selectBackground) || cr.selectBackground,
+		selectListBackground: (style && style.selectListBackground) || cr.selectListBackground,
+		selectForeground: (style && style.selectForeground) || cr.selectForeground,
+		selectBorder: (style && style.selectBorder) || cr.selectBorder,
+		disabledSelectBackground: (style && style.disabledSelectBackground) || sqlcolors.disabledInputBackground,
+		disabledSelectForeground: (style && style.disabledSelectForeground) || sqlcolors.disabledInputForeground,
+		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || cr.inputValidationInfoBorder,
+		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || cr.inputValidationInfoBackground,
+		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || cr.inputValidationWarningBorder,
+		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || cr.inputValidationWarningBackground,
+		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || cr.inputValidationErrorBorder,
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || cr.inputValidationErrorBackground,
+		focusBorder: (style && style.focusBorder) || cr.focusBorder,
+		listFocusBackground: (style && style.listFocusBackground) || cr.listFocusBackground,
+		listFocusForeground: (style && style.listFocusForeground) || cr.listFocusForeground,
+		listFocusOutline: (style && style.listFocusOutline) || cr.activeContrastBorder,
+		listHoverBackground: (style && style.listHoverBackground) || cr.listHoverBackground,
+		listHoverForeground: (style && style.listHoverForeground) || cr.listHoverForeground,
+		listHoverOutline: (style && style.listFocusOutline) || cr.activeContrastBorder
+	}, widget);
+}
+
+export function attachListBoxStyler(widget: IThemable, themeService: IThemeService, style?:
+	{
+		selectBackground?: cr.ColorIdentifier,
+		selectForeground?: cr.ColorIdentifier,
+		selectBorder?: cr.ColorIdentifier,
+		inputValidationInfoBorder?: cr.ColorIdentifier,
+		inputValidationInfoBackground?: cr.ColorIdentifier,
+		inputValidationWarningBorder?: cr.ColorIdentifier,
+		inputValidationWarningBackground?: cr.ColorIdentifier,
+		inputValidationErrorBorder?: cr.ColorIdentifier,
+		inputValidationErrorBackground?: cr.ColorIdentifier
+	}): IDisposable {
+	return attachStyler(themeService, {
+		selectBackground: (style && style.selectBackground) || cr.selectBackground,
+		selectForeground: (style && style.selectForeground) || cr.selectForeground,
+		selectBorder: (style && style.selectBorder) || cr.selectBorder,
+		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || cr.inputValidationInfoBorder,
+		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || cr.inputValidationInfoBackground,
+		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || cr.inputValidationWarningBorder,
+		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || cr.inputValidationWarningBackground,
+		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || cr.inputValidationErrorBorder,
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || cr.inputValidationErrorBackground
+	}, widget);
+}
+
+export function attachTableStyler(widget: IThemable, themeService: IThemeService, style?: {
+	listFocusBackground?: cr.ColorIdentifier,
+	listFocusForeground?: cr.ColorIdentifier,
+	listActiveSelectionBackground?: cr.ColorIdentifier,
+	listActiveSelectionForeground?: cr.ColorIdentifier,
+	listFocusAndSelectionBackground?: cr.ColorIdentifier,
+	listFocusAndSelectionForeground?: cr.ColorIdentifier,
+	listInactiveFocusBackground?: cr.ColorIdentifier,
+	listInactiveSelectionBackground?: cr.ColorIdentifier,
+	listInactiveSelectionForeground?: cr.ColorIdentifier,
+	listHoverBackground?: cr.ColorIdentifier,
+	listHoverForeground?: cr.ColorIdentifier,
+	listDropBackground?: cr.ColorIdentifier,
+	listFocusOutline?: cr.ColorIdentifier,
+	listInactiveFocusOutline?: cr.ColorIdentifier,
+	listSelectionOutline?: cr.ColorIdentifier,
+	listHoverOutline?: cr.ColorIdentifier,
+	tableHeaderBackground?: cr.ColorIdentifier,
+	tableHeaderForeground?: cr.ColorIdentifier
+}): IDisposable {
+	return attachStyler(themeService, {
+		listFocusBackground: (style && style.listFocusBackground) || cr.listFocusBackground,
+		listFocusForeground: (style && style.listFocusForeground) || cr.listFocusForeground,
+		listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || cr.listActiveSelectionBackground,
+		listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || cr.listActiveSelectionForeground,
+		listFocusAndSelectionBackground: style && style.listFocusAndSelectionBackground || sqlcolors.listFocusAndSelectionBackground,
+		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || cr.listActiveSelectionForeground,
+		listInactiveFocusBackground: (style && style.listInactiveFocusBackground),
+		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || cr.listInactiveSelectionBackground,
+		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || cr.listInactiveSelectionForeground,
+		listHoverBackground: (style && style.listHoverBackground) || cr.listHoverBackground,
+		listHoverForeground: (style && style.listHoverForeground) || cr.listHoverForeground,
+		listDropBackground: (style && style.listDropBackground) || cr.listDropBackground,
+		listFocusOutline: (style && style.listFocusOutline) || cr.activeContrastBorder,
+		listSelectionOutline: (style && style.listSelectionOutline) || cr.activeContrastBorder,
+		listHoverOutline: (style && style.listHoverOutline) || cr.activeContrastBorder,
+		listInactiveFocusOutline: style && style.listInactiveFocusOutline,
+		tableHeaderBackground: (style && style.tableHeaderBackground) || sqlcolors.tableHeaderBackground,
+		tableHeaderForeground: (style && style.tableHeaderForeground) || sqlcolors.tableHeaderForeground
+	}, widget);
+}
+
+export function attachEditableDropdownStyler(widget: IThemable, themeService: IThemeService, style?: {
+	listFocusBackground?: cr.ColorIdentifier,
+	listFocusForeground?: cr.ColorIdentifier,
+	listActiveSelectionBackground?: cr.ColorIdentifier,
+	listActiveSelectionForeground?: cr.ColorIdentifier,
+	listFocusAndSelectionBackground?: cr.ColorIdentifier,
+	listFocusAndSelectionForeground?: cr.ColorIdentifier,
+	listInactiveFocusBackground?: cr.ColorIdentifier,
+	listInactiveSelectionBackground?: cr.ColorIdentifier,
+	listInactiveSelectionForeground?: cr.ColorIdentifier,
+	listHoverBackground?: cr.ColorIdentifier,
+	listHoverForeground?: cr.ColorIdentifier,
+	listDropBackground?: cr.ColorIdentifier,
+	listFocusOutline?: cr.ColorIdentifier,
+	listInactiveFocusOutline?: cr.ColorIdentifier,
+	listSelectionOutline?: cr.ColorIdentifier,
+	listHoverOutline?: cr.ColorIdentifier,
+
+	inputBackground?: cr.ColorIdentifier,
+	inputForeground?: cr.ColorIdentifier,
+	inputBorder?: cr.ColorIdentifier,
+	inputValidationInfoBorder?: cr.ColorIdentifier,
+	inputValidationInfoBackground?: cr.ColorIdentifier,
+	inputValidationWarningBorder?: cr.ColorIdentifier,
+	inputValidationWarningBackground?: cr.ColorIdentifier,
+	inputValidationErrorBorder?: cr.ColorIdentifier,
+	inputValidationErrorBackground?: cr.ColorIdentifier,
+	contextBackground?: cr.ColorIdentifier,
+	contextBorder?: cr.ColorIdentifier
+}): IDisposable {
+	return attachStyler(themeService, {
+		listFocusBackground: (style && style.listFocusBackground) || cr.listFocusBackground,
+		listFocusForeground: (style && style.listFocusForeground) || cr.listFocusForeground,
+		listActiveSelectionBackground: (style && style.listActiveSelectionBackground) || cr.lighten(cr.listActiveSelectionBackground, 0.1),
+		listActiveSelectionForeground: (style && style.listActiveSelectionForeground) || cr.listActiveSelectionForeground,
+		listFocusAndSelectionBackground: style && style.listFocusAndSelectionBackground || cr.listActiveSelectionBackground,
+		listFocusAndSelectionForeground: (style && style.listFocusAndSelectionForeground) || cr.listActiveSelectionForeground,
+		listInactiveFocusBackground: (style && style.listInactiveFocusBackground),
+		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || cr.listInactiveSelectionBackground,
+		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || cr.listInactiveSelectionForeground,
+		listHoverBackground: (style && style.listHoverBackground) || cr.listHoverBackground,
+		listHoverForeground: (style && style.listHoverForeground) || cr.listHoverForeground,
+		listDropBackground: (style && style.listDropBackground) || cr.listDropBackground,
+		listFocusOutline: (style && style.listFocusOutline) || cr.activeContrastBorder,
+		listSelectionOutline: (style && style.listSelectionOutline) || cr.activeContrastBorder,
+		listHoverOutline: (style && style.listHoverOutline) || cr.activeContrastBorder,
+		listInactiveFocusOutline: style && style.listInactiveFocusOutline,
+		inputBackground: (style && style.inputBackground) || cr.inputBackground,
+		inputForeground: (style && style.inputForeground) || cr.inputForeground,
+		inputBorder: (style && style.inputBorder) || cr.inputBorder,
+		inputValidationInfoBorder: (style && style.inputValidationInfoBorder) || cr.inputValidationInfoBorder,
+		inputValidationInfoBackground: (style && style.inputValidationInfoBackground) || cr.inputValidationInfoBackground,
+		inputValidationWarningBorder: (style && style.inputValidationWarningBorder) || cr.inputValidationWarningBorder,
+		inputValidationWarningBackground: (style && style.inputValidationWarningBackground) || cr.inputValidationWarningBackground,
+		inputValidationErrorBorder: (style && style.inputValidationErrorBorder) || cr.inputValidationErrorBorder,
+		inputValidationErrorBackground: (style && style.inputValidationErrorBackground) || cr.inputValidationErrorBackground,
+		contextBackground: (style && style.contextBackground) || cr.editorBackground,
+		contextBorder: (style && style.contextBorder) || cr.inputBorder
+	}, widget);
+}
+
+export function attachButtonStyler(widget: IThemable, themeService: IThemeService, style?: {
+	buttonForeground?: cr.ColorIdentifier,
+	buttonBackground?: cr.ColorIdentifier,
+	buttonHoverBackground?: cr.ColorIdentifier,
+	buttonFocusOutline?: cr.ColorIdentifier
+}): IDisposable {
+	return attachStyler(themeService, {
+		buttonForeground: (style && style.buttonForeground) || cr.buttonForeground,
+		buttonBackground: (style && style.buttonBackground) || cr.buttonBackground,
+		buttonHoverBackground: (style && style.buttonHoverBackground) || cr.buttonHoverBackground,
+		buttonBorder: cr.contrastBorder,
+		buttonFocusOutline: (style && style.buttonFocusOutline) || sqlcolors.buttonFocusOutline
+	}, widget);
+}
+
+export function attachCheckboxStyler(widget: IThemable, themeService: IThemeService, style?: { disabledCheckboxForeground?: cr.ColorIdentifier })
+	: IDisposable {
+	return attachStyler(themeService, {
+		disabledCheckboxForeground: (style && style.disabledCheckboxForeground) || sqlcolors.disabledCheckboxForeground
+	}, widget);
+}
+
+export function attachPanelStyler(widget: IThemable, themeService: IThemeService) {
+	return attachStyler<IPanelColors>(themeService, {
+		headerForeground: SIDE_BAR_SECTION_HEADER_FOREGROUND,
+		headerBackground: SIDE_BAR_SECTION_HEADER_BACKGROUND,
+		// headerHighContrastBorder: index === 0 ? null : contrastBorder,
+		dropBackground: SIDE_BAR_DRAG_AND_DROP_BACKGROUND
+	}, widget);
+}