ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-21 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

clean up some promise use in cms (#7004)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-06 15:58:47 -07:00
committed by GitHub
parent fda4ba81c3
commit 02f497712d
4 changed files with 261 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/services/connection/browser/connectionDialogService.ts
View File

@@ -395,7 +395,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
params?: INewConnectionParams,
model?: IConnectionProfile,
connectionResult?: IConnectionResult,
doConnect: boolean = true): Thenable<IConnectionProfile> {
doConnect: boolean = true): Promise<IConnectionProfile> {
if (!doConnect) {
this.ignoreNextConnect = true;
@@ -408,7 +408,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
}, error => {
this._dialogDeferredPromise.reject(error);
});
return this._dialogDeferredPromise;
return this._dialogDeferredPromise.promise;
}
public showDialog(
@@ -416,7 +416,7 @@ export class ConnectionDialogService implements IConnectionDialogService {
params?: INewConnectionParams,
model?: IConnectionProfile,
connectionResult?: IConnectionResult,
connectionOptions?: IConnectionCompletionOptions): Thenable<void> {
connectionOptions?: IConnectionCompletionOptions): Promise<void> {
this._connectionManagementService = connectionManagementService;

4
src/sql/workbench/services/connection/common/connectionDialogService.ts
View File

@@ -13,11 +13,11 @@ export interface IConnectionDialogService {
/**
* Opens the connection dialog and returns the promise for successfully opening the dialog
*/
showDialog(connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult, connectionOptions?: IConnectionCompletionOptions): Thenable<void>;
showDialog(connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult, connectionOptions?: IConnectionCompletionOptions): Promise<void>;
/**
* Opens the connection dialog and returns the promise when connection is made
* or dialog is closed
*/
openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult, doConnect?: boolean): Thenable<IConnectionProfile>;
openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult, doConnect?: boolean): Promise<IConnectionProfile>;
}