Initial Code Layering (#3788)

* 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

* revert back tslint rules

* move css file

* add missing svgs
This commit is contained in:
Anthony Dresser
2019-01-25 14:52:35 -08:00
committed by GitHub
parent c8986464ec
commit ea67859de7
338 changed files with 2036 additions and 7386 deletions

View File

@@ -0,0 +1,178 @@
/*---------------------------------------------------------------------------------------------
* 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 'vs/css!sql/media/icons/common-icons';
import 'vs/css!./media/errorMessageDialog';
import { Button } from 'sql/base/browser/ui/button/button';
import { Modal } from 'sql/base/browser/ui/modal/modal';
import * as TelemetryKeys from 'sql/common/telemetryKeys';
import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler';
import { Builder } from 'vs/base/browser/builder';
import Severity from 'vs/base/common/severity';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
import { IPartService } from 'vs/workbench/services/part/common/partService';
import { Event, Emitter } from 'vs/base/common/event';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { localize } from 'vs/nls';
import { IAction } from 'vs/base/common/actions';
const maxActions = 1;
export class ErrorMessageDialog extends Modal {
private _body: HTMLElement;
private _okButton: Button;
private _copyButton: Button;
private _actionButtons: Button[];
private _actions: IAction[];
private _severity: Severity;
private _message: string;
private _messageDetails: string;
private _okLabel: string;
private _closeLabel: string;
private _onOk = new Emitter<void>();
public onOk: Event<void> = this._onOk.event;
constructor(
@IThemeService themeService: IThemeService,
@IClipboardService clipboardService: IClipboardService,
@IPartService partService: IPartService,
@ITelemetryService telemetryService: ITelemetryService,
@IContextKeyService contextKeyService: IContextKeyService
) {
super('', TelemetryKeys.ErrorMessage, partService, telemetryService, clipboardService, themeService, contextKeyService, { isFlyout: false, hasTitleIcon: true });
this._okLabel = localize('errorMessageDialog.ok', 'OK');
this._closeLabel = localize('errorMessageDialog.close', 'Close');
}
protected renderBody(container: HTMLElement) {
new Builder(container).div({ 'class': 'error-dialog' }, (bodyBuilder) => {
this._body = bodyBuilder.getHTMLElement();
});
}
public render() {
super.render();
this._register(attachModalDialogStyler(this, this._themeService));
this.createCopyButton();
this._actionButtons = [];
for (let i = 0; i < maxActions; i++) {
this._actionButtons.unshift(this.createStandardButton('Action', () => this.onActionSelected(i)));
}
this._okButton = this.addFooterButton(this._okLabel, () => this.ok());
this._register(attachButtonStyler(this._okButton, this._themeService));
}
private createCopyButton() {
let copyButtonLabel = localize('copyDetails', 'Copy details');
this._copyButton = this.addFooterButton(copyButtonLabel, () => this._clipboardService.writeText(this._messageDetails), 'left');
this._copyButton.icon = 'icon scriptToClipboard';
this._copyButton.element.title = copyButtonLabel;
this._register(attachButtonStyler(this._copyButton, this._themeService, { buttonBackground: SIDE_BAR_BACKGROUND, buttonHoverBackground: SIDE_BAR_BACKGROUND, buttonForeground: SIDE_BAR_FOREGROUND }));
}
private createStandardButton(label: string, onSelect: () => void): Button {
let button = this.addFooterButton(label, onSelect, 'right');
this._register(attachButtonStyler(button, this._themeService));
return button;
}
private onActionSelected(index: number): void {
// Call OK so it always closes
this.ok();
// Run the action if possible
if (this._actions && index < this._actions.length) {
this._actions[index].run();
}
}
protected layout(height?: number): void {
// Nothing to re-layout
}
private updateDialogBody(): void {
let builder = new Builder(this._body).empty();
builder.div({ class: 'error-message' }, (errorContainer) => {
errorContainer.getHTMLElement().innerText = this._message;
});
}
private updateIconTitle(): void {
switch (this._severity) {
case Severity.Error:
this.titleIconClassName = 'sql icon error';
break;
case Severity.Warning:
this.titleIconClassName = 'sql icon warning';
break;
case Severity.Info:
this.titleIconClassName = 'sql icon info';
break;
}
}
/* espace key */
protected onClose() {
this.ok();
}
/* enter key */
protected onAccept() {
this.ok();
}
public ok(): void {
this._onOk.fire();
this.close();
}
public close() {
this.hide();
}
public open(severity: Severity, headerTitle: string, message: string, messageDetails: string, actions: IAction[]) {
this._severity = severity;
this._message = message;
this.title = headerTitle;
this._messageDetails = messageDetails;
if (this._messageDetails) {
this._copyButton.element.style.visibility = 'visible';
} else {
this._copyButton.element.style.visibility = 'hidden';
}
this.resetActions();
if (actions && actions.length > 0) {
for (let i = 0; i < maxActions && i < actions.length; i++) {
this._actions.push(actions[i]);
let button = this._actionButtons[i];
button.label = actions[i].label;
button.element.style.visibility = 'visible';
}
this._okButton.label = this._closeLabel;
} else {
this._okButton.label = this._okLabel;
}
this.updateIconTitle();
this.updateDialogBody();
this.show();
this._okButton.focus();
}
private resetActions(): void {
this._actions = [];
for (let actionButton of this._actionButtons) {
actionButton.element.style.visibility = 'hidden';
}
}
public dispose(): void {
}
}

View File

@@ -0,0 +1,58 @@
/*---------------------------------------------------------------------------------------------
* 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 { localize } from 'vs/nls';
import Severity from 'vs/base/common/severity';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IAction } from 'vs/base/common/actions';
import { ErrorMessageDialog } from 'sql/workbench/services/errorMessage/browser/errorMessageDialog';
import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
export class ErrorMessageService implements IErrorMessageService {
_serviceBrand: any;
private _errorDialog: ErrorMessageDialog;
private handleOnOk(): void {
}
constructor(
@IInstantiationService private _instantiationService: IInstantiationService
) { }
public showDialog(severity: Severity, headerTitle: string, message: string, messageDetails?: string, actions?: IAction[]): void {
this.doShowDialog(severity, headerTitle, message, messageDetails, actions);
}
private doShowDialog(severity: Severity, headerTitle: string, message: string, messageDetails: string, actions?: IAction[]): void {
if (!this._errorDialog) {
this._errorDialog = this._instantiationService.createInstance(ErrorMessageDialog);
this._errorDialog.onOk(() => this.handleOnOk());
this._errorDialog.render();
}
let title = headerTitle ? headerTitle : this.getDefaultTitle(severity);
return this._errorDialog.open(severity, title, message, messageDetails, actions);
}
private getDefaultTitle(severity: Severity) {
let defaultTitle: string;
switch (severity) {
case Severity.Error:
defaultTitle = localize('error', 'Error');
break;
case Severity.Warning:
defaultTitle = localize('warning', 'Warning');
break;
case Severity.Info:
defaultTitle = localize('info', 'Info');
}
return defaultTitle;
}
}

View File

@@ -0,0 +1,26 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.error-dialog {
padding: 15px;
overflow: auto;
height: 200px;
}
.error-dialog .icon.error, .error-dialog .icon.warning , .error-dialog .icon.info {
width: 20px;
height: 20px;
float: left;
margin-right: 10px;
}
/* Make the test selectable*/
.error-dialog .error-message {
-webkit-user-select: text;
user-select: text;
}
.modal .footer-button a.monaco-button.monaco-text-button.icon.scriptToClipboard {
width: 120px;
}