Merge VS Code 1.31.1 (#4283)

This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions

View File

@@ -7,7 +7,6 @@
import { Event, Emitter } from 'vs/base/common/event';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { TPromise } from 'vs/base/common/winjs.base';
import * as azdata from 'azdata';
@@ -61,7 +60,7 @@ export class BackupUiService implements IBackupUiService {
}
}
public showBackupDialog(connection: IConnectionProfile): TPromise<void> {
public showBackupDialog(connection: IConnectionProfile): Promise<void> {
let self = this;
self._connectionUri = ConnectionUtils.generateUri(connection);
self._currentProvider = connection.providerName;
@@ -81,7 +80,7 @@ export class BackupUiService implements IBackupUiService {
}
let backupOptions = this.getOptions(this._currentProvider);
return new TPromise<void>((resolve) => {
return new Promise<void>((resolve) => {
let uri = this._connectionManagementService.getConnectionUri(connection)
+ ProviderConnectionInfo.idSeparator
+ ConnectionUtils.ConnectionUriBackupIdAttributeName