ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Even more strictness (#11879)

Browse Source 
* add more to strict nulls

* maintain error handling properly

* fix lint

* the rest of workbench/services

* fix compile
This commit is contained in:
Anthony Dresser
2020-08-20 14:00:26 -07:00
committed by GitHub
parent ca2b893c2c
commit adfdd56907
23 changed files with 260 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts
View File

@@ -29,14 +29,14 @@ 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 _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;
@@ -75,10 +75,12 @@ export class ErrorMessageDialog extends Modal {
private createCopyButton() {
let copyButtonLabel = localize('copyDetails', "Copy details");
this._copyButton = this.addFooterButton(copyButtonLabel, () => this._clipboardService.writeText(this._messageDetails).catch(err => onUnexpectedError(err)), 'left');
this._copyButton.icon = 'codicon 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 }));
if (this._messageDetails) {
this._copyButton = this.addFooterButton(copyButtonLabel, () => this._clipboardService.writeText(this._messageDetails!).catch(err => onUnexpectedError(err)), 'left');
}
this._copyButton!.icon = 'codicon 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 {
@@ -101,8 +103,8 @@ export class ErrorMessageDialog extends Modal {
}
private updateDialogBody(): void {
DOM.clearNode(this._body);
DOM.append(this._body, DOM.$('div.error-message')).innerText = this._message;
DOM.clearNode(this._body!);
DOM.append(this._body!, DOM.$('div.error-message')).innerText = this._message!;
}
private updateIconTitle(): void {
@@ -138,15 +140,15 @@ export class ErrorMessageDialog extends Modal {
this.hide();
}
public open(severity: Severity, headerTitle: string, message: string, messageDetails: string, actions: IAction[]) {
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';
this._copyButton!.element.style.visibility = 'visible';
} else {
this._copyButton.element.style.visibility = 'hidden';
this._copyButton!.element.style.visibility = 'hidden';
}
this.resetActions();
if (actions && actions.length > 0) {
@@ -156,14 +158,14 @@ export class ErrorMessageDialog extends Modal {
button.label = actions[i].label;
button.element.style.visibility = 'visible';
}
this._okButton.label = this._closeLabel;
this._okButton!.label = this._closeLabel;
} else {
this._okButton.label = this._okLabel;
this._okButton!.label = this._okLabel;
}
this.updateIconTitle();
this.updateDialogBody();
this.show();
this._okButton.focus();
this._okButton!.focus();
}
private resetActions(): void {

16
src/sql/workbench/services/errorMessage/browser/errorMessageService.ts
View File

@@ -15,7 +15,7 @@ export class ErrorMessageService implements IErrorMessageService {
_serviceBrand: undefined;
private _errorDialog: ErrorMessageDialog;
private _errorDialog?: ErrorMessageDialog;
private handleOnOk(): void {
}
@@ -28,7 +28,7 @@ export class ErrorMessageService implements IErrorMessageService {
this.doShowDialog(severity, headerTitle, message, messageDetails, actions);
}
private doShowDialog(severity: Severity, headerTitle: string, message: string, messageDetails: string, actions?: IAction[]): void {
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());
@@ -40,17 +40,15 @@ export class ErrorMessageService implements IErrorMessageService {
}
private getDefaultTitle(severity: Severity) {
let defaultTitle: string;
switch (severity) {
case Severity.Error:
defaultTitle = localize('error', "Error");
break;
return localize('error', "Error");
case Severity.Warning:
defaultTitle = localize('warning', "Warning");
break;
return localize('warning', "Warning");
case Severity.Info:
defaultTitle = localize('info', "Info");
return localize('info', "Info");
case Severity.Ignore:
return localize('ignore', "Ignore");
}
return defaultTitle;
}
}