ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-26 17:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix more floating promises (#8460)

Browse Source
This commit is contained in:
Charles Gagnon
2019-11-27 08:04:51 -08:00
committed by GitHub
parent 4145ecfb32
commit 0e9797c394
14 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts
View File

@@ -6,7 +6,7 @@
import 'vs/css!sql/media/icons/common-icons';
import 'vs/css!./media/fileBrowserDialog';
import { Button } from 'sql/base/browser/ui/button/button';
import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
import { InputBox, OnLoseFocusParams } from 'sql/base/browser/ui/inputBox/inputBox';
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper';
import { Modal } from 'sql/workbench/browser/modal/modal';
@@ -32,6 +32,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { onUnexpectedError } from 'vs/base/common/errors';
export class FileBrowserDialog extends Modal {
private _viewModel: FileBrowserViewModel;
@@ -61,7 +62,7 @@ export class FileBrowserDialog extends Modal {
) {
super(title, TelemetryKeys.Backup, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { isFlyout: true, hasTitleIcon: false, hasBackButton: true, hasSpinner: true });
this._viewModel = this._instantiationService.createInstance(FileBrowserViewModel);
this._viewModel.onAddFileTree(args => this.handleOnAddFileTree(args.rootNode, args.selectedNode, args.expandedNodes));
this._viewModel.onAddFileTree(args => this.handleOnAddFileTree(args.rootNode, args.selectedNode, args.expandedNodes).catch(err => onUnexpectedError(err)));
this._viewModel.onPathValidate(args => this.handleOnValidate(args.succeeded, args.message));
}
@@ -114,7 +115,7 @@ export class FileBrowserDialog extends Modal {
expandPath: string,
fileFilters: [{ label: string, filters: string[] }],
fileValidationServiceType: string,
) {
): void {
this._viewModel.initialize(ownerUri, expandPath, fileFilters, fileValidationServiceType);
this._fileFilterSelectBox.setOptions(this._viewModel.formattedFileFilters);
this._fileFilterSelectBox.select(0);
@@ -127,7 +128,7 @@ export class FileBrowserDialog extends Modal {
this._fileBrowserTreeView = this._instantiationService.createInstance(FileBrowserTreeView);
this._fileBrowserTreeView.setOnClickedCallback((arg) => this.onClicked(arg));
this._fileBrowserTreeView.setOnDoubleClickedCallback((arg) => this.onDoubleClicked(arg));
this._viewModel.openFileBrowser(0, false);
this._viewModel.openFileBrowser(0, false).catch(err => onUnexpectedError(err));
}
/* enter key */
@@ -137,8 +138,8 @@ export class FileBrowserDialog extends Modal {
}
}
private handleOnAddFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]) {
this.updateFileTree(rootNode, selectedNode, expandedNodes);
private async handleOnAddFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): Promise<void> {
await this.updateFileTree(rootNode, selectedNode, expandedNodes);
this.spinner = false;
}
@@ -176,10 +177,11 @@ export class FileBrowserDialog extends Modal {
this.enableOkButton();
}
private onFilePathBlur(param) {
if (!strings.isFalsyOrWhitespace(param.value)) {
this._viewModel.validateFilePaths([param.value]);
private async onFilePathBlur(params: OnLoseFocusParams): Promise<boolean> {
if (!strings.isFalsyOrWhitespace(params.value)) {
return this._viewModel.validateFilePaths([params.value]);
}
return true;
}
private ok() {
@@ -196,35 +198,35 @@ export class FileBrowserDialog extends Modal {
}
}
private close() {
private close(): void {
if (this._fileBrowserTreeView) {
this._fileBrowserTreeView.dispose();
}
this._onOk.dispose();
this.hide();
this._viewModel.closeFileBrowser();
this._viewModel.closeFileBrowser().catch(err => onUnexpectedError(err));
}
private updateFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): void {
this._fileBrowserTreeView.renderBody(this._treeContainer, rootNode, selectedNode, expandedNodes);
private async updateFileTree(rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): Promise<void> {
await this._fileBrowserTreeView.renderBody(this._treeContainer, rootNode, selectedNode, expandedNodes);
this._fileBrowserTreeView.setVisible(true);
this._fileBrowserTreeView.layout(DOM.getTotalHeight(this._treeContainer));
}
private onFilterSelectChanged(filterIndex) {
private async onFilterSelectChanged(filterIndex): Promise<void> {
this.spinner = true;
this._viewModel.openFileBrowser(filterIndex, true);
await this._viewModel.openFileBrowser(filterIndex, true);
}
private registerListeners(): void {
this._register(this._fileFilterSelectBox.onDidSelect(selection => {
this.onFilterSelectChanged(selection.index);
this._register(this._fileFilterSelectBox.onDidSelect(selectData => {
this.onFilterSelectChanged(selectData.index).catch(err => onUnexpectedError(err));
}));
this._register(this._filePathInputBox.onDidChange(e => {
this.onFilePathChange(e);
}));
this._register(this._filePathInputBox.onLoseFocus(params => {
this.onFilePathBlur(params);
this._register(this._filePathInputBox.onLoseFocus((params: OnLoseFocusParams) => {
this.onFilePathBlur(params).catch(err => onUnexpectedError(err));
}));
// Theme styler

2
src/sql/workbench/services/fileBrowser/browser/fileBrowserDialogController.ts
View File

@@ -26,7 +26,7 @@ export class FileBrowserDialogController implements IFileBrowserDialogController
fileValidationServiceType: string,
isWide: boolean,
handleOnOk: (path: string) => void
) {
): void {
if (!this._fileBrowserDialog) {
this._fileBrowserDialog = this._instantiationService.createInstance(FileBrowserDialog, localize('filebrowser.selectFile', "Select a file"));
this._fileBrowserDialog.render();

45
src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts
View File

@@ -8,7 +8,6 @@ import { FileBrowserController } from 'sql/workbench/services/fileBrowser/browse
import { FileBrowserRenderer } from 'sql/workbench/services/fileBrowser/browser/fileBrowserRenderer';
import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces';
import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
import errors = require('vs/base/common/errors');
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
import * as DOM from 'vs/base/browser/dom';
import nls = require('vs/nls');
@@ -37,7 +36,7 @@ export class FileBrowserTreeView extends Disposable implements IDisposable {
/**
* Render the view body
*/
public renderBody(container: HTMLElement, rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): void {
public async renderBody(container: HTMLElement, rootNode: FileNode, selectedNode: FileNode, expandedNodes: FileNode[]): Promise<void> {
if (!this._tree) {
DOM.addClass(container, 'show-file-icons');
this._tree = this._register(this.createFileBrowserTree(container, this._instantiationService));
@@ -48,16 +47,15 @@ export class FileBrowserTreeView extends Disposable implements IDisposable {
}
if (rootNode) {
this._tree.setInput(rootNode).then(() => {
if (expandedNodes) {
this._tree.expandAll(expandedNodes);
}
if (selectedNode) {
this._tree.select(selectedNode);
this._tree.setFocus(selectedNode);
}
this._tree.getFocus();
}, errors.onUnexpectedError);
await this._tree.setInput(rootNode);
if (expandedNodes) {
await this._tree.expandAll(expandedNodes);
}
if (selectedNode) {
this._tree.select(selectedNode);
this._tree.setFocus(selectedNode);
}
this._tree.getFocus();
}
}
@@ -85,7 +83,7 @@ export class FileBrowserTreeView extends Disposable implements IDisposable {
/**
* Refresh the tree
*/
public refreshTree(rootNode: FileNode): void {
public async refreshTree(rootNode: FileNode): Promise<void> {
let selectedElement: any;
let targetsToExpand: any[];
@@ -103,17 +101,16 @@ export class FileBrowserTreeView extends Disposable implements IDisposable {
}
if (rootNode) {
this._tree.setInput(rootNode).then(() => {
// Make sure to expand all folders that were expanded in the previous session
if (targetsToExpand) {
this._tree.expandAll(targetsToExpand);
}
if (selectedElement) {
this._tree.select(selectedElement);
this._tree.setFocus(selectedElement);
}
this._tree.getFocus();
}, errors.onUnexpectedError);
await this._tree.setInput(rootNode);
// Make sure to expand all folders that were expanded in the previous session
if (targetsToExpand) {
await this._tree.expandAll(targetsToExpand);
}
if (selectedElement) {
this._tree.select(selectedElement);
this._tree.setFocus(selectedElement);
}
this._tree.getFocus();
}
}