Fix Converting circular structure to JSON Error in tree-view

CHANGELOG.md

@@ -4,6 +4,7 @@
 - [task] added support for VS Code task contribution points: `taskDefinitions`, `problemMatchers`, and `problemPatterns`
 - [plugin] added support of debug activation events [#5645](https://github.com/theia-ide/theia/pull/5645)
 - [security] Bump lodash.mergewith from 4.6.1 to 4.6.2
+- [plugin] Fixed `Converting circular structure to JSON` Error [#5661](https://github.com/theia-ide/theia/pull/5661)
 
 Breaking changes:
 
@@ -12,6 +13,7 @@ Breaking changes:
 - [plugin] added basic support of activation events [#5622](https://github.com/theia-ide/theia/pull/5622)
   - `HostedPluginSupport` is refactored to support multiple `PluginManagerExt` properly
 - [plugin] added support of `workspaceContains` activation events [#5649](https://github.com/theia-ide/theia/pull/5649)
+- [plugin] activate dependencies before activating a plugin [#5661](https://github.com/theia-ide/theia/pull/5661)
 
 ## v0.8.0
 

packages/plugin-ext-vscode/src/node/scanner-vscode.ts

@@ -28,7 +28,8 @@ export class VsCodePluginScanner extends TheiaPluginScanner implements PluginSca
 
     getModel(plugin: PluginPackage): PluginModel {
         const result: PluginModel = {
-            id: `${plugin.publisher}.${plugin.name}`,
+            // see id definition: https://github.com/microsoft/vscode/blob/15916055fe0cb9411a5f36119b3b012458fe0a1d/src/vs/platform/extensions/common/extensions.ts#L167-L169
+            id: `${plugin.publisher.toLowerCase()}.${plugin.name.toLowerCase()}`,
             name: plugin.name,
             publisher: plugin.publisher,
             version: plugin.version,

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 {

packages/plugin-ext/src/hosted/node/scanners/scanner-theia.ts

@@ -83,7 +83,8 @@ export class TheiaPluginScanner implements PluginScanner {
 
     getModel(plugin: PluginPackage): PluginModel {
         const result: PluginModel = {
-            id: `${plugin.publisher}.${plugin.name}`,
+            // see id definition: https://github.com/microsoft/vscode/blob/15916055fe0cb9411a5f36119b3b012458fe0a1d/src/vs/platform/extensions/common/extensions.ts#L167-L169
+            id: `${plugin.publisher.toLowerCase()}.${plugin.name.toLowerCase()}`,
             name: plugin.name,
             publisher: plugin.publisher,
             version: plugin.version,

packages/plugin-ext/src/plugin/plugin-context.ts

@@ -598,7 +598,7 @@ export function createAPIFactory(
             },
             // tslint:disable-next-line:no-any
             getPlugin(pluginId: string): theia.Plugin<any> | undefined {
-                const plg = pluginManager.getPluginById(pluginId);
+                const plg = pluginManager.getPluginById(pluginId.toLowerCase());
                 if (plg) {
                     return new Plugin(pluginManager, plg);
                 }

packages/plugin-ext/src/plugin/plugin-manager.ts

@@ -71,7 +71,7 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
 
     private readonly registry = new Map<string, Plugin>();
     private readonly activations = new Map<string, (() => Promise<void>)[] | undefined>();
-    private readonly loadedPlugins = new Set<string>();
+    private readonly loadedPlugins = new Map<string, Promise<void>>();
     private readonly activatedPlugins = new Map<string, ActivatedPlugin>();
     private pluginActivationPromises = new Map<string, Deferred<void>>();
     private pluginContextsMap: Map<string, theia.PluginContext> = new Map();
@@ -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);
                 }
@@ -180,19 +179,38 @@ export class PluginManagerExtImpl implements PluginManagerExt, PluginManager {
         this.activations.set(activationEvent, activations);
     }
 
-    protected async loadPlugin(plugin: Plugin, configStorage: ConfigStorage): Promise<void> {
-        if (this.loadedPlugins.has(plugin.model.id)) {
+    protected async loadPlugin(plugin: Plugin, configStorage: ConfigStorage, visited = new Set<string>()): Promise<void> {
+        // in order to break cycles
+        if (visited.has(plugin.model.id)) {
             return;
         }
-        this.loadedPlugins.add(plugin.model.id);
+        visited.add(plugin.model.id);
+
+        let loading = this.loadedPlugins.get(plugin.model.id);
+        if (!loading) {
+            loading = (async () => {
+                if (plugin.rawModel.extensionDependencies) {
+                    for (const dependencyId of plugin.rawModel.extensionDependencies) {
+                        const dependency = this.registry.get(dependencyId);
+                        if (dependency) {
+                            await this.loadPlugin(dependency, configStorage, visited);
+                        } 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 ?
-        if (pluginMain !== undefined) {
-            await this.startPlugin(plugin, configStorage, pluginMain);
-        } else {
-            console.error(`Unable to load a plugin from "${plugin.pluginPath}"`);
+                const pluginMain = this.host.loadPlugin(plugin);
+                // able to load the plug-in ?
+                if (pluginMain !== undefined) {
+                    await this.startPlugin(plugin, configStorage, pluginMain);
+                } else {
+                    console.error(`Unable to load a plugin from "${plugin.pluginPath}"`);
+                }
+            })();
         }
+        this.loadedPlugins.set(plugin.model.id, loading);
+        return loading;
     }
 
     $updateStoragePath(path: string | undefined): PromiseLike<void> {

packages/plugin-ext/src/plugin/tree/tree-views.ts

@@ -242,6 +242,9 @@ class TreeViewExtImpl<T> extends Disposable {
                     }
                 }
 
+                if (treeItem.command) {
+                    treeItem.command.arguments = [id];
+                }
                 const treeViewItem = {
                     id,
                     label: label,