Some promise fixes (#8216)

* Some promise fixes

* changes to how we're logging errors

* Fix the tests

* Fix a few other issues
This commit is contained in:
Amir Omidi
2019-11-05 11:50:39 -08:00
committed by GitHub
parent 5a392dfd58
commit 1b88c10197
6 changed files with 73 additions and 66 deletions

View File

@@ -11,6 +11,7 @@ import { Trace } from 'vs/platform/instantiation/common/instantiationService';
import { values } from 'vs/base/common/map';
import { IModuleFactory, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { ILogService } from 'vs/platform/log/common/log';
const selectorCounter = new Map<string, number>();
@@ -64,6 +65,15 @@ export function bootstrapAngular<T>(service: IInstantiationService, moduleType:
if (callbackSetModule) {
callbackSetModule(moduleRef);
}
}).catch((e) => {
service.invokeFunction((accessor) => {
const logService = accessor.get(ILogService);
if (!logService) {
console.error(e);
return;
}
logService.error(e);
});
});
return uniqueSelectorString;

View File

@@ -281,7 +281,7 @@ export class ObjectExplorerService implements IObjectExplorerService {
this._serverTreeView.deleteObjectExplorerNodeAndRefreshTree(connection).then(() => {
this.sendUpdateNodeEvent(connection, session.errorMessage);
connection.isDisconnecting = true;
this._connectionManagementService.disconnect(connection).then((value) => {
this._connectionManagementService.disconnect(connection).then(() => {
connection.isDisconnecting = false;
}).catch((e) => this.logService.error(e));
});