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

@@ -6,7 +6,6 @@
'use strict';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import {
ExtHostAccountManagementShape,
@@ -111,7 +110,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
}
public $accountsChanged(handle: number, accounts: azdata.Account[]): Thenable<void> {
return this._onDidChangeAccounts.fire({ accounts: accounts });
return Promise.resolve(this._onDidChangeAccounts.fire({ accounts: accounts }));
}
public $registerAccountProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Disposable {
@@ -158,7 +157,7 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
private _withProvider<R>(handle: number, callback: (provider: azdata.AccountProvider) => Thenable<R>): Thenable<R> {
let provider = this._providers[handle];
if (provider === undefined) {
return TPromise.wrapError(new Error(`Provider ${handle} not found.`));
return Promise.reject(new Error(`Provider ${handle} not found.`));
}
return callback(provider.provider);
}