From a86b48bb8e814bd894fcef64a1f284f45331a883 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 30 Mar 2016 11:58:23 +0200 Subject: [PATCH] make worker manager an entry point --- src/vs/languages/buildfile-editor-languages.js | 4 +++- src/vs/languages/typescript/common/typescriptMode.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/languages/buildfile-editor-languages.js b/src/vs/languages/buildfile-editor-languages.js index a04b7b55f21..7ebc0796fd5 100644 --- a/src/vs/languages/buildfile-editor-languages.js +++ b/src/vs/languages/buildfile-editor-languages.js @@ -51,10 +51,12 @@ exports.collectModules = function(args) { // ---- typescript ----------------------------------- common.define('vs/languages/typescript/common/typescriptMode', SHARED_JS_TS) .combine(worker) - .define('vs/languages/typescript/common/worker/workerImpl'); + .define('vs/languages/typescript/common/worker/workerImpl', SHARED_JS_TS); // ---- javascript ---------------------------- common.define('vs/languages/javascript/common/javascript', SHARED_JS_TS.concat(['vs/languages/typescript/common/typescriptMode'])); + common.define('vs/languages/typescript/common/worker/workerManager', SHARED_JS_TS); + return result; }; \ No newline at end of file diff --git a/src/vs/languages/typescript/common/typescriptMode.ts b/src/vs/languages/typescript/common/typescriptMode.ts index 284170f0cff..478ebf61e79 100644 --- a/src/vs/languages/typescript/common/typescriptMode.ts +++ b/src/vs/languages/typescript/common/typescriptMode.ts @@ -29,6 +29,8 @@ export class TypeScriptMode extends AbstractMode implements lifecycle.IDisposabl super(descriptor.id); if (threadService.isInMainThread) { + // this is needed as long as this mode is also instantiated in the + // worker require(['vs/languages/typescript/common/worker/workerManager'], manager => { this._disposables.push(manager.create(this.getId(), this._modelService, this._markerService)); }, err => { -- GitLab