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

@@ -11,7 +11,6 @@ import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import { SqlMainContext, MainThreadDataProtocolShape, ExtHostDataProtocolShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { DataProviderType } from 'sql/workbench/api/common/sqlExtHostTypes';
import { TPromise } from 'vs/base/common/winjs.base';
export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
@@ -203,7 +202,7 @@ export class ExtHostDataProtocol extends ExtHostDataProtocolShape {
if (provider.buildConnectionInfo) {
return provider.buildConnectionInfo(connectionString);
} else {
return TPromise.as(undefined);
return Promise.resolve(undefined);
}
}