Merge branch 'assembly-list-dnd'

Author: Rpinski

vscode-extension/src/commands/addAssemblyByPath.ts

@@ -0,0 +1,25 @@
+/*------------------------------------------------------------------------------------------------
+ *  Copyright (c) 2025 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 { addAssemblyFromFilePath } from "./utils";
+import Node from "../protocol/Node";
+
+export function registerAddAssemblyByPathCommand(
+  decompiledTreeProvider: DecompiledTreeProvider,
+  decompiledTreeView: vscode.TreeView<Node>
+) {
+  return vscode.commands.registerCommand(
+    "ilspy.addAssemblyByPath",
+    async (filePath: string) => {
+      addAssemblyFromFilePath(
+        filePath,
+        decompiledTreeProvider,
+        decompiledTreeView
+      );
+    }
+  );
+}

vscode-extension/src/commands/decompileAssemblyViaDialog.ts

@@ -7,6 +7,7 @@ import * as vscode from "vscode";
 import { DecompiledTreeProvider } from "../decompiler/DecompiledTreeProvider";
 import { addAssemblyFromFilePath } from "./utils";
 import Node from "../protocol/Node";
+import { ASSEMBLY_FILE_EXTENSIONS } from "../decompiler/utils";
 
 export function registerDecompileAssemblyViaDialogCommand(
   decompiledTreeProvider: DecompiledTreeProvider,
@@ -34,14 +35,7 @@ async function promptForAssemblyFilesPathViaDialog(): Promise<string[]> {
     canSelectFolders: false,
     canSelectMany: true,
     filters: {
-      ".NET Decompilables": [
-        "dll",
-        "exe",
-        "winmd",
-        "netmodule",
-        "wasm",
-        "nupkg",
-      ],
+      ".NET Decompilables": ASSEMBLY_FILE_EXTENSIONS,
     },
   });
 

vscode-extension/src/decompiler/DecompiledTreeProvider.ts

@@ -11,11 +11,12 @@ import {
   TreeItemCollapsibleState,
   ProviderResult,
   window,
-  ThemeIcon,
   ExtensionContext,
   commands,
   Uri,
-  MarkdownString,
+  DataTransfer,
+  TreeDragAndDropController,
+  CancellationToken,
 } from "vscode";
 import IILSpyBackend from "./IILSpyBackend";
 import Node from "../protocol/Node";
@@ -28,15 +29,26 @@ import {
 } from "./settings";
 import { getNodeIcon } from "../icons";
 import { NodeFlags } from "../protocol/NodeFlags";
-import { createNodeTooltip, getNodeContextValue, hasNodeFlag } from "./utils";
-
-export class DecompiledTreeProvider implements TreeDataProvider<Node> {
+import {
+  ASSEMBLY_FILE_EXTENSIONS,
+  createNodeTooltip,
+  getNodeContextValue,
+  hasNodeFlag,
+} from "./utils";
+import path = require("path");
+import OutputWindowLogger from "../OutputWindowLogger";
+import { addAssemblyFromFilePath } from "../commands/utils";
+
+export class DecompiledTreeProvider
+  implements TreeDataProvider<Node>, TreeDragAndDropController<Node>
+{
   private _onDidChangeTreeData: EventEmitter<any> = new EventEmitter<any>();
   readonly onDidChangeTreeData: Event<any> = this._onDidChangeTreeData.event;
 
   constructor(
     private extensionContext: ExtensionContext,
-    private backend: IILSpyBackend
+    private backend: IILSpyBackend,
+    private logger: OutputWindowLogger
   ) {}
 
   public refresh(): void {
@@ -183,6 +195,43 @@ export class DecompiledTreeProvider implements TreeDataProvider<Node> {
       ) ?? []
     );
   }
+
+  readonly dropMimeTypes = ["text/uri-list"];
+  readonly dragMimeTypes = [];
+
+  async handleDrop(
+    target: Node | undefined,
+    dataTransfer: DataTransfer,
+    token: CancellationToken
+  ): Promise<void> {
+    const test = 1;
+    const uris =
+      (await dataTransfer.get("text/uri-list")?.asString())?.split("\r\n") ??
+      [];
+    uris.forEach((uri) => {
+      const fileUri = Uri.parse(uri);
+      const filePath = fileUri.fsPath;
+      if (this.isValidFile(fileUri.fsPath)) {
+        this.processDroppedFile(target, filePath);
+        this.logger.writeLine(
+          `Dropped assembly file ${filePath}, trying to add to assembly list`
+        );
+      } else {
+        this.logger.writeLine(`Dropped unsupported file ${filePath}!`);
+      }
+    });
+  }
+
+  private isValidFile(filePath: string): boolean {
+    const ext = path.extname(filePath);
+    return ASSEMBLY_FILE_EXTENSIONS.includes(
+      path.extname(filePath).substring(1)
+    );
+  }
+
+  private processDroppedFile(target: Node | undefined, filePath: string): void {
+    commands.executeCommand("ilspy.addAssemblyByPath", filePath);
+  }
 }
 
 function setTreeWithNodes(treeWithNodes: boolean) {

vscode-extension/src/decompiler/utils.ts

@@ -3,6 +3,15 @@ import Node from "../protocol/Node";
 import { NodeType } from "../protocol/NodeType";
 import { NodeFlags } from "../protocol/NodeFlags";
 
+export const ASSEMBLY_FILE_EXTENSIONS = [
+  "dll",
+  "exe",
+  "winmd",
+  "netmodule",
+  "wasm",
+  "nupkg",
+];
+
 export function isTypeNode(nodeType: NodeType) {
   return (
     nodeType === NodeType.Class ||

vscode-extension/src/extension.ts

@@ -45,6 +45,7 @@ import { AnalyzeResultTreeProvider } from "./decompiler/analyze/AnalyzeResultTre
 import { registerAnalyzeCommand } from "./commands/analyze";
 import { registerRefreshAssemblyListCommand } from "./commands/refreshAssemblyList";
 import { AssemblyNodeDecorationProvider } from "./decompiler/AssemblyNodeDecorationProvider";
+import { registerAddAssemblyByPathCommand } from "./commands/addAssemblyByPath";
 
 let client: LanguageClient;
 
@@ -99,7 +100,8 @@ export async function activate(context: ExtensionContext) {
   const ilspyBackend = new ILSpyBackend(client);
   const decompiledTreeProvider = new DecompiledTreeProvider(
     context,
-    ilspyBackend
+    ilspyBackend,
+    logger
   );
   const decompiledTreeView = createDecompiledTreeView(decompiledTreeProvider);
   disposables.push(decompiledTreeView);
@@ -110,6 +112,9 @@ export async function activate(context: ExtensionContext) {
     window.registerFileDecorationProvider(assemblyNodeDecorationProvider)
   );
 
+  disposables.push(
+    registerAddAssemblyByPathCommand(decompiledTreeProvider, decompiledTreeView)
+  );
   disposables.push(
     registerDecompileAssemblyInWorkspaceCommand(
       decompiledTreeProvider,

vscode-extension/src/view/treeViews.ts

@@ -13,6 +13,7 @@ export function createDecompiledTreeView(
   return window.createTreeView("ilspyDecompiledMembers", {
     treeDataProvider: decompiledTreeProvider,
     showCollapseAll: true,
+    dragAndDropController: decompiledTreeProvider
   });
 }