Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -261,15 +261,35 @@ export class ConnectionDialogWidget extends Modal {
type: 'question'
};
return this._messageService.confirm(confirm).then(confirmation => {
if (!confirmation.confirmed) {
return TPromise.as(false);
} else {
// @SQLTODO
return new TPromise<boolean>((resolve, reject) => {
let confirmed: boolean = this._messageService.confirm(confirm);
if (confirmed) {
this._connectionManagementService.clearRecentConnectionsList();
this.open(false);
return TPromise.as(true);
}
resolve(confirmed);
});
//this._messageService.confirm(confirm).then(confirmation => {
// if (!confirmation.confirmed) {
// return TPromise.as(false);
// } else {
// this._connectionManagementService.clearRecentConnectionsList();
// this.open(false);
// return TPromise.as(true);
// }
// });
// return this._messageService.confirm(confirm).then(confirmation => {
// if (!confirmation.confirmed) {
// return TPromise.as(false);
// } else {
// this._connectionManagementService.clearRecentConnectionsList();
// this.open(false);
// return TPromise.as(true);
// }
// });
}
private createRecentConnectionList(): void {