Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove cyclic dependency between IExtensionService and IThreadService

Browse Source
This commit is contained in:
Alex Dima
2017-08-14 15:34:46 +02:00
parent 2e5311ca6e
commit b420c54f0f
3 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ import { MainThreadStorage } from './mainThreadStorage';
import { MainThreadTelemetry } from './mainThreadTelemetry';
import { MainThreadTerminalService } from './mainThreadTerminalService';
import { MainThreadWorkspace } from './mainThreadWorkspace';
import { MainProcessExtensionService } from './mainThreadExtensionService';
import { MainProcessExtensionServiceAPI } from './mainThreadExtensionService';
import { MainThreadFileSystemEventService } from './mainThreadFileSystemEventService';
import { MainThreadTask } from './mainThreadTask';
import { MainThreadSCM } from './mainThreadSCM';
@@ -93,15 +93,13 @@ export class ExtHostContribution implements IWorkbenchContribution {
col.define(MainContext.MainThreadSCM).set(create(MainThreadSCM));
col.define(MainContext.MainThreadTask).set(create(MainThreadTask));
col.define(MainContext.MainThreadCredentials).set(create(MainThreadCredentials));
if (this.extensionService instanceof MainProcessExtensionService) {
col.define(MainContext.MainProcessExtensionService).set(<MainProcessExtensionService>this.extensionService);
}
col.define(MainContext.MainProcessExtensionService).set(create(MainProcessExtensionServiceAPI));
col.finish(true, this.threadService);
// Other interested parties
create(JSONValidationExtensionPoint);
create(JSONValidationExtensionPoint); // TODO@rehost: can survive an ext host restart
create(ColorExtensionPoint);
this.instantiationService.createInstance(LanguageConfigurationFileHandler);
this.instantiationService.createInstance(LanguageConfigurationFileHandler); // TODO@rehost: can survive an ext host restart
create(MainThreadFileSystemEventService);
create(SaveParticipant);
}