Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

towards ext-host-restart: properly implement dispose-methods in variouds MainThreadXYZ-types

Browse Source
This commit is contained in:
Johannes Rieken
2017-08-14 16:56:03 +02:00
parent 9098d9ff7c
commit 2e5311ca6e
12 changed files with 137 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/api/electron-browser/mainThreadConfiguration.ts
View File

@@ -6,7 +6,7 @@
import URI from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IDisposable } from 'vs/base/common/lifecycle';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
import { IConfigurationEditingService, ConfigurationTarget } from 'vs/workbench/services/configuration/common/configurationEditing';
@@ -14,8 +14,8 @@ import { MainThreadConfigurationShape, ExtHostContext } from '../node/extHost.pr
export class MainThreadConfiguration extends MainThreadConfigurationShape {
private _configurationEditingService: IConfigurationEditingService;
private _toDispose: IDisposable;
private readonly _configurationEditingService: IConfigurationEditingService;
private readonly _configurationListener: IDisposable;
constructor(
@IConfigurationEditingService configurationEditingService: IConfigurationEditingService,
@@ -26,13 +26,13 @@ export class MainThreadConfiguration extends MainThreadConfigurationShape {
this._configurationEditingService = configurationEditingService;
const proxy = threadService.get(ExtHostContext.ExtHostConfiguration);
this._toDispose = configurationService.onDidUpdateConfiguration(() => {
this._configurationListener = configurationService.onDidUpdateConfiguration(() => {
proxy.$acceptConfigurationChanged(configurationService.getConfigurationData());
});
}
public dispose(): void {
this._toDispose = dispose(this._toDispose);
this._configurationListener.dispose();
}
$updateConfigurationOption(target: ConfigurationTarget, key: string, value: any, resource: URI): TPromise<void> {