Implement a new viewer for decompiled code based on virtual documents

- Replace the temporary files opened in normal text editors with virtual documents - Introduce a setting for the default output language of decompilation, which is overridable for single documents through editor toolbar. There is no need to open both C# and IL.
icsharpcode · Sep 13, 2021 · 3c1a220 · 3c1a220
1 parent 0e37c3b
commit 3c1a220
Show file tree

Hide file tree

Showing 17 changed files with 378 additions and 182 deletions.
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -25,6 +25,26 @@
 	],
 	"main": "./out/extension.js",
 	"contributes": {
+		"configuration": [
+			{
+				"title": "ILSpy",
+				"properties": {
+					"ilspy.defaultOutputLanguage": {
+						"description": "Defines to which language ILSpy will decompile assemblies by default. Note that you can choose a different language for a specific view later.",
+						"type": "string",
+						"default": "C#",
+						"enum": [
+							"C#",
+							"IL"
+						],
+						"enumDescriptions": [
+							"Decompile to C# by default",
+							"Decompile to readable IL instructions by default"
+						]
+					}
+				}
+			}
+		],
 		"views": {
 			"explorer": [
 				{
@@ -56,6 +76,11 @@
 				"command": "ilspy.unloadAssembly",
 				"title": "Unload Assembly",
 				"category": "ILSpy"
+			},
+			{
+				"command": "ilspy.selectOutputLanguage",
+				"title": "Output language",
+				"category": "ILSpy"
 			}
 		],
 		"menus": {
@@ -66,6 +91,13 @@
 					"group": "1_GeneralCommands@1"
 				}
 			],
+			"editor/title": [
+				{
+					"command": "ilspy.selectOutputLanguage",
+					"group": "navigation",
+					"when": "resourceScheme == ilspy"
+				}
+			],
 			"commandPalette": [
 				{
 					"command": "ilspy.decompileAssemblyInWorkspace",
@@ -112,4 +144,4 @@
 	"extensionDependencies": [
 		"ms-dotnettools.vscode-dotnet-runtime"
 	]
-}
+}
diff --git a/vscode-extension/src/commands/decompileAssemblyInWorkspace.ts b/vscode-extension/src/commands/decompileAssemblyInWorkspace.ts
@@ -5,11 +5,9 @@
 
 import * as vscode from "vscode";
 import * as path from "path";
-import {
-  DecompiledTreeProvider,
-  MemberNode,
-} from "../decompiler/DecompiledTreeProvider";
+import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
 import { addAssemblyToTree } from "./utils";
+import { MemberNode } from "../decompiler/MemberNode";
 
 export function registerDecompileAssemblyInWorkspace(
   decompiledTreeProvider: DecompiledTreeProvider,

diff --git a/vscode-extension/src/commands/decompileAssemblyViaDialog.ts b/vscode-extension/src/commands/decompileAssemblyViaDialog.ts
@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from "vscode";
-import {
-  DecompiledTreeProvider,
-  MemberNode,
-} from "../decompiler/DecompiledTreeProvider";
+import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
+import { MemberNode } from "../decompiler/MemberNode";
 import { addAssemblyFromFilePath } from "./utils";
 
 export function registerDecompileAssemblyViaDialog(

diff --git a/vscode-extension/src/commands/selectOutputLanguage.ts b/vscode-extension/src/commands/selectOutputLanguage.ts
@@ -0,0 +1,56 @@
+/*------------------------------------------------------------------------------------------------
+ *  Copyright (c) 2021 ICSharpCode
+ *  Licensed under the MIT License. See LICENSE.TXT in the project root for license information.
+ *-----------------------------------------------------------------------------------------------*/
+
+import * as vscode from "vscode";
+import { DecompilerTextDocumentContentProvider } from "../decompiler/DecompilerTextDocumentContentProvider";
+import { languageInfos } from "../decompiler/languageInfos";
+import { ILSPY_URI_SCHEME } from "../decompiler/memberNodeUri";
+import { getDefaultOutputLanguage } from "../decompiler/settings";
+import { LanguageName } from "../protocol/DecompileResponse";
+
+type OutputLanguageQuickPickItem = vscode.QuickPickItem & {
+  languageName: string;
+};
+
+export function registerSelectOutputLanguage(
+  contentProvider: DecompilerTextDocumentContentProvider
+) {
+  return vscode.commands.registerCommand(
+    "ilspy.selectOutputLanguage",
+    async () => {
+      let document = vscode.window.activeTextEditor?.document;
+      if (document?.uri.scheme !== ILSPY_URI_SCHEME) {
+        return;
+      }
+
+      const language = await vscode.window.showQuickPick(
+        Object.entries(languageInfos).map((languageInfoEntry) => {
+          const [languageName, languageInfo] = languageInfoEntry;
+          return {
+            label: languageInfo.displayName,
+            description:
+              getDefaultOutputLanguage() === languageName
+                ? "default"
+                : undefined,
+            languageName,
+          } as OutputLanguageQuickPickItem;
+        }),
+        {
+          title: "Please select language of decompiled code output",
+        }
+      );
+      if (language) {
+        contentProvider.setDocumentOutputLanguage(
+          document.uri,
+          language.languageName as LanguageName
+        );
+        vscode.languages.setTextDocumentLanguage(
+          document,
+          languageInfos[language.languageName].vsLanguageMode
+        );
+      }
+    }
+  );
+}
diff --git a/vscode-extension/src/commands/showCode.ts b/vscode-extension/src/commands/showCode.ts
@@ -0,0 +1,35 @@
+/*------------------------------------------------------------------------------------------------
+ *  Copyright (c) 2021 ICSharpCode
+ *  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 { memberNodeToUri } from "../decompiler/memberNodeUri";
+import { MemberNode } from "../decompiler/MemberNode";
+import { languageInfos } from "../decompiler/languageInfos";
+import { getDefaultOutputLanguage } from "../decompiler/settings";
+
+let lastSelectedNode: MemberNode | undefined = undefined;
+
+export function registerShowCode(
+  decompiledTreeProvider: DecompiledTreeProvider
+) {
+  return vscode.commands.registerCommand(
+    "showCode",
+    async (node: MemberNode) => {
+      if (lastSelectedNode === node) {
+        return;
+      }
+
+      lastSelectedNode = node;
+
+      let doc = await vscode.workspace.openTextDocument(memberNodeToUri(node));
+      vscode.languages.setTextDocumentLanguage(
+        doc,
+        languageInfos[getDefaultOutputLanguage()].vsLanguageMode
+      );
+      await vscode.window.showTextDocument(doc, { preview: true });
+    }
+  );
+}
diff --git a/vscode-extension/src/commands/showDecompiledCode.ts b/vscode-extension/src/commands/showDecompiledCode.ts
diff --git a/vscode-extension/src/commands/unloadAssembly.ts b/vscode-extension/src/commands/unloadAssembly.ts
@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from "vscode";
-import {
-  DecompiledTreeProvider,
-  MemberNode,
-} from "../decompiler/DecompiledTreeProvider";
+import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
+import { MemberNode } from "../decompiler/MemberNode";
 
 export function registerUnloadAssembly(
   decompiledTreeProvider: DecompiledTreeProvider

diff --git a/vscode-extension/src/commands/utils.ts b/vscode-extension/src/commands/utils.ts
@@ -5,10 +5,8 @@
 
 import * as vscode from "vscode";
 import * as fs from "fs";
-import {
-  DecompiledTreeProvider,
-  MemberNode,
-} from "../decompiler/DecompiledTreeProvider";
+import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
+import { MemberNode } from "../decompiler/MemberNode";
 
 export function addAssemblyFromFilePath(
   filePath: string,