Merge pull request #103 from spouliot/reload

Add 'Reload Assembly' command

vscode-extension/package.json

@@ -77,6 +77,11 @@
 				"title": "Unload Assembly",
 				"category": "ILSpy"
 			},
+			{
+				"command": "ilspy.reloadAssembly",
+				"title": "Reload Assembly",
+				"category": "ILSpy"
+			},
 			{
 				"command": "ilspy.selectOutputLanguage",
 				"title": "Output language",
@@ -99,6 +104,11 @@
 					"command": "ilspy.unloadAssembly",
 					"when": "view == ilspyDecompiledMembers && viewItem == assemblyNode",
 					"group": "1_GeneralCommands@1"
+				},
+				{
+					"command": "ilspy.reloadAssembly",
+					"when": "view == ilspyDecompiledMembers && viewItem == assemblyNode",
+					"group": "1_GeneralCommands@1"
 				}
 			],
 			"editor/title": [
@@ -121,6 +131,10 @@
 					"command": "ilspy.unloadAssembly",
 					"when": "ilspy.backendAvailable"
 				},
+				{
+					"command": "ilspy.reloadAssembly",
+					"when": "ilspy.backendAvailable"
+				},
 				{
 					"command": "ilspy.selectOutputLanguage",
 					"when": "resourceScheme == ilspy"

vscode-extension/src/commands/reloadAssembly.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from "vscode";
+import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
+import { MemberNode } from "../decompiler/MemberNode";
+
+export function registerReloadAssembly(
+  decompiledTreeProvider: DecompiledTreeProvider
+) {
+  return vscode.commands.registerCommand(
+    "ilspy.reloadAssembly",
+    async (node: MemberNode) => {
+      if (!node) {
+        vscode.window.showInformationMessage(
+          'Please use context menu: right-click on the assembly node then select "Reload Assembly"'
+        );
+        return;
+      }
+      await decompiledTreeProvider.reloadAssembly(node.assembly);
+    }
+  );
+}

vscode-extension/src/decompiler/DecompiledTreeProvider.ts

@@ -65,6 +65,25 @@ export class DecompiledTreeProvider implements TreeDataProvider<MemberNode> {
     return response?.removed ?? false;
   }
 
+  public async reloadAssembly(assembly: string): Promise<boolean> {
+    const response = await this.backend.sendRemoveAssembly({
+      assemblyPath: assembly,
+    });
+    if (response?.removed) {
+      this.backend.assemblies.delete(assembly);
+
+      const response = await this.backend.sendAddAssembly({
+        assemblyPath: assembly,
+      });
+      if (response?.added && response?.assemblyData) {
+        this.backend.assemblies.set(assembly, response.assemblyData);
+        this.refresh();
+        return true;
+      }
+    }
+    return false;
+  }
+
   public getTreeItem(element: MemberNode): TreeItem {
     return {
       label: element.name,
@@ -191,7 +210,7 @@ export class DecompiledTreeProvider implements TreeDataProvider<MemberNode> {
   }
 
   public getParent?(element: MemberNode): ProviderResult<MemberNode> {
-    // Note: This allows relealing of assembly nodes in TreeView, which are placed in root. It won't work for other nodes.
+    // Note: This allows releasing of assembly nodes in TreeView, which are placed in root. It won't work for other nodes.
     return undefined;
   }
 

vscode-extension/src/extension.ts

@@ -14,6 +14,7 @@ import ILSpyBackend from "./decompiler/ILSpyBackend";
 import { DecompiledTreeProvider } from "./decompiler/DecompiledTreeProvider";
 import { registerDecompileAssemblyInWorkspace } from "./commands/decompileAssemblyInWorkspace";
 import { registerDecompileAssemblyViaDialog } from "./commands/decompileAssemblyViaDialog";
+import { registerReloadAssembly } from "./commands/reloadAssembly";
 import { registerUnloadAssembly } from "./commands/unloadAssembly";
 import { acquireDotnetRuntime } from "./dotnet-acquire/acquire";
 import OutputWindowLogger from "./OutputWindowLogger";
@@ -116,6 +117,7 @@ export async function activate(context: ExtensionContext) {
   disposables.push(
     registerSelectOutputLanguage(decompilerTextDocumentContentProvider)
   );
+  disposables.push(registerReloadAssembly(decompileTreeProvider));
   disposables.push(registerUnloadAssembly(decompileTreeProvider));
 
   context.subscriptions.push(...disposables);