clean up some disposable use (#6832)

This commit is contained in:
Anthony Dresser
2019-08-20 14:34:13 -07:00
committed by GitHub
parent 54cf062737
commit c540e81108
23 changed files with 139 additions and 244 deletions

View File

@@ -5,7 +5,7 @@
import * as azdata from 'azdata';
import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { Disposable } from 'vs/base/common/lifecycle';
import {
ExtHostResourceProviderShape,
MainThreadResourceProviderShape,
@@ -17,20 +17,19 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
@extHostNamedCustomer(SqlMainContext.MainThreadResourceProvider)
export class MainThreadResourceProvider implements MainThreadResourceProviderShape {
export class MainThreadResourceProvider extends Disposable implements MainThreadResourceProviderShape {
private _providerMetadata: { [handle: number]: azdata.AccountProviderMetadata };
private _proxy: ExtHostResourceProviderShape;
private _toDispose: IDisposable[];
constructor(
extHostContext: IExtHostContext,
@IResourceProviderService private _resourceProviderService: IResourceProviderService
) {
super();
this._providerMetadata = {};
if (extHostContext) {
this._proxy = extHostContext.getProxy(SqlExtHostContext.ExtHostResourceProvider);
}
this._toDispose = [];
}
public $registerResourceProvider(providerMetadata: azdata.ResourceProviderMetadata, handle: number): Thenable<any> {
@@ -55,8 +54,4 @@ export class MainThreadResourceProvider implements MainThreadResourceProviderSha
this._resourceProviderService.unregisterProvider(this._providerMetadata[handle].id);
return Promise.resolve(null);
}
public dispose(): void {
this._toDispose = dispose(this._toDispose);
}
}