Added uninstall behaviour

plus smaller bugfixes and adapted versions

Signed-off-by: jbicker <[email protected]>

examples/browser/package.json

@@ -59,6 +59,7 @@
     "@theia/typescript": "^0.13.0",
     "@theia/userstorage": "^0.13.0",
     "@theia/variable-resolver": "^0.13.0",
+    "@theia/vsx-registry": "^0.13.0",
     "@theia/workspace": "^0.13.0"
   },
   "scripts": {

examples/electron/package.json

@@ -55,6 +55,7 @@
     "@theia/typescript": "^0.13.0",
     "@theia/userstorage": "^0.13.0",
     "@theia/variable-resolver": "^0.13.0",
+    "@theia/vsx-registry": "^0.13.0",
     "@theia/workspace": "^0.13.0"
   },
   "scripts": {

packages/plugin-ext/src/common/plugin-protocol.ts

@@ -626,6 +626,8 @@ export interface PluginDeployerHandler {
     deployFrontendPlugins(frontendPlugins: PluginDeployerEntry[]): Promise<void>;
     deployBackendPlugins(backendPlugins: PluginDeployerEntry[]): Promise<void>;
 
+    removeDeployedPluginId(pluginId: string): void;
+
     getPluginDependencies(pluginToBeInstalled: PluginDeployerEntry): Promise<PluginDependencies | undefined>
 }
 
@@ -670,6 +672,8 @@ export interface PluginServer {
      */
     deploy(pluginEntry: string): Promise<void>;
 
+    undeploy(pluginId: string): Promise<void>;
+
     setStorageValue(key: string, value: KeysToAnyValues, kind: PluginStorageKind): Promise<boolean>;
     getStorageValue(key: string, kind: PluginStorageKind): Promise<KeysToAnyValues>;
     getAllStorageValues(kind: PluginStorageKind): Promise<KeysToKeysToAnyValue>;

packages/plugin-ext/src/hosted/node/hosted-plugin-deployer-handler.ts

@@ -57,6 +57,15 @@ export class HostedPluginDeployerHandler implements PluginDeployerHandler {
         return [...this.deployedBackendPlugins.keys()];
     }
 
+    removeDeployedPluginId(pluginId: string): void {
+        if (this.deployedBackendPlugins.get(pluginId)) {
+            this.deployedBackendPlugins.delete(pluginId);
+        }
+        if (this.deployedFrontendPlugins.get(pluginId)) {
+            this.deployedFrontendPlugins.delete(pluginId);
+        }
+    }
+
     getDeployedPlugin(pluginId: string): DeployedPlugin | undefined {
         const metadata = this.deployedBackendPlugins.get(pluginId);
         if (metadata) {

packages/plugin-ext/src/main/node/plugin-deployer-impl.ts

@@ -104,6 +104,11 @@ export class PluginDeployerImpl implements PluginDeployer {
 
     }
 
+    public async undeploy(pluginId: string): Promise<void> {
+        this.pluginDeployerHandler.removeDeployedPluginId(pluginId);
+        this.onDidDeployEmitter.fire();
+    }
+
     public async deploy(pluginEntry: string): Promise<void> {
         await this.deployMultipleEntries([pluginEntry]);
     }

packages/plugin-ext/src/main/node/plugin-server-handler.ts

@@ -33,6 +33,10 @@ export class PluginServerHandler implements PluginServer {
         return this.pluginDeployer.deploy(pluginEntry);
     }
 
+    undeploy(pluginId: string): Promise<void> {
+        return this.pluginDeployer.undeploy(pluginId);
+    }
+
     setStorageValue(key: string, value: KeysToAnyValues, kind: PluginStorageKind): Promise<boolean> {
         return this.pluginsKeyValueStorage.set(key, value, kind);
     }

packages/vsx-registry/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@theia/vsx-registry",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Theia - VSX Registry",
   "dependencies": {
-    "@theia/core": "^0.12.0",
-    "@theia/plugin-ext": "^0.12.0",
+    "@theia/core": "^0.13.0",
+    "@theia/plugin-ext": "^0.13.0",
     "@types/sanitize-html": "^1.13.31",
     "@types/showdown": "^1.7.1",
     "sanitize-html": "^1.14.1",
@@ -42,7 +42,7 @@
     "test": "theiaext test"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "^0.12.0"
+    "@theia/ext-scripts": "^0.13.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"

packages/vsx-registry/src/browser/view/list/vsx-registry-list-widget.tsx

@@ -61,9 +61,14 @@ export class VSXRegistryListWidget extends ReactWidget {
         this.title.label = this.options.label;
 
         this.model.onExtensionsChanged(() => {
-            this.extensions = this.model.getExtensionsByLocation(this.options.location);
-            this.update();
+            this.updateExtensionList();
         });
+        this.updateExtensionList();
+    }
+
+    protected updateExtensionList(): void {
+        this.extensions = this.model.getExtensionsByLocation(this.options.location);
+        this.update();
     }
 
     protected render(): React.ReactNode {

packages/vsx-registry/src/browser/view/list/vsx-registry-widget.ts

@@ -109,6 +109,7 @@ export class VSXRegistryWidget extends ViewContainer {
         });
         this.panel.node.tabIndex = -1;
         layout.addWidget(this.vscxSearchbar);
+        this.vscxSearchbar.update();
         layout.addWidget(this.panel);
     }
 }

packages/vsx-registry/src/browser/vsx-registry-service.ts

@@ -52,9 +52,10 @@ export class VSXRegistryService {
     protected async init(): Promise<void> {
         this.vsxRegistryPreferences.onPreferenceChanged(e => {
             this.apiUrl = this.vsxRegistryPreferences['vsx-registry.api-url'];
+            this.toDispose.push(this.pluginSupport.onDidChangePlugins(() => this.updateInstalled()));
             this.updateSearch();
+            this.updateInstalled();
         });
-        this.toDispose.push(this.pluginSupport.onDidChangePlugins(() => this.updateInstalled()));
     }
 
     protected createEndpoint(arr: string[], queries?: { key: string, value: string | number }[]): string {
@@ -100,10 +101,8 @@ export class VSXRegistryService {
     }
 
     async uninstall(extension: VSCodeExtensionPart): Promise<void> {
-        let res: () => void;
-        const p = new Promise<void>(r => res = r);
-        setTimeout(() => res(), 3000);
-        return p;
+        const id = extension.publisher.toLowerCase() + '.' + extension.name.toLowerCase();
+        await this.pluginServer.undeploy(id);
     }
 
     async outdated(): Promise<VSCodeExtensionPart[]> {