[plugin] activate dependencies before activating a plugin

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jul 12, 2019 · 57fb86a · 57fb86a
1 parent c2ec867
commit 57fb86a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/packages/plugin-ext-vscode/src/node/scanner-vscode.ts b/packages/plugin-ext-vscode/src/node/scanner-vscode.ts
@@ -28,7 +28,7 @@ export class VsCodePluginScanner extends TheiaPluginScanner implements PluginSca
 
     getModel(plugin: PluginPackage): PluginModel {
         const result: PluginModel = {
-            id: `${plugin.publisher}.${plugin.name}`,
+            id: `${plugin.publisher.toLowerCase()}.${plugin.name.toLowerCase()}`,
             name: plugin.name,
             publisher: plugin.publisher,
             version: plugin.version,

diff --git a/packages/plugin-ext/src/common/plugin-protocol.ts b/packages/plugin-ext/src/common/plugin-protocol.ts
@@ -51,6 +51,7 @@ export interface PluginPackage {
     contributes?: PluginPackageContribution;
     packagePath: string;
     activationEvents?: string[];
+    extensionDependencies?: string[];
 }
 export namespace PluginPackage {
     export function toPluginUrl(pck: PluginPackage, relativePath: string): string {

diff --git a/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts b/packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts
@@ -83,7 +83,7 @@ export class TheiaPluginScanner implements PluginScanner {
 
     getModel(plugin: PluginPackage): PluginModel {
         const result: PluginModel = {
-            id: `${plugin.publisher}.${plugin.name}`,
+            id: `${plugin.publisher.toLowerCase()}.${plugin.name.toLowerCase()}`,
             name: plugin.name,
             publisher: plugin.publisher,
             version: plugin.version,

diff --git a/packages/plugin-ext/src/plugin/plugin-manager.ts b/packages/plugin-ext/src/plugin/plugin-manager.ts
@@ -143,7 +143,6 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
         for (const activationEvent of pluginInit.activationEvents) {
             await this.$activateByEvent(activationEvent);
         }
-        // TODO eager activate by `workspaceContains`
 
         if (this.host.loadTests) {
             return this.host.loadTests();
@@ -167,7 +166,7 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
             } else {
                 for (let activationEvent of plugin.rawModel.activationEvents) {
                     if (activationEvent === 'onUri') {
-                        activationEvent = `onUri:theia://${plugin.model.publisher.toLowerCase()}.${plugin.model.name.toLowerCase()}`;
+                        activationEvent = `onUri:theia://${plugin.model.id}`;
                     }
                     this.setActivation(activationEvent, activation);
                 }
@@ -185,6 +184,16 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
             return;
         }
         this.loadedPlugins.add(plugin.model.id);
+        if (plugin.rawModel.extensionDependencies) {
+            for (const dependencyId of plugin.rawModel.extensionDependencies) {
+                const dependency = this.registry.get(dependencyId);
+                if (dependency) {
+                    await this.loadPlugin(dependency, configStorage);
+                } else {
+                    console.warn(`cannot find a dependency to '${dependencyId}' for '${plugin.model.id}' plugin`);
+                }
+            }
+        }
 
         const pluginMain = this.host.loadPlugin(plugin);
         // able to load the plug-in ?