From 5f4c020269f804e8ad71ef1d5a65dca24c51eb5f Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 1 May 2026 19:03:40 +0200 Subject: [PATCH] ModuleReferenceTreeNode under References folder Existing assembly fixtures (BCL System.Linq, System.Net.Http, mscorlib) do not have module references, so this slice is wired and exercised by the existing References-folder tests but not directly asserted. Assisted-by: Claude:claude-opus-4-7:Claude Code --- ILSpy/TreeNodes/ModuleReferenceTreeNode.cs | 99 ++++++++++++++++++++++ ILSpy/TreeNodes/ReferenceFolderTreeNode.cs | 3 + 2 files changed, 102 insertions(+) create mode 100644 ILSpy/TreeNodes/ModuleReferenceTreeNode.cs diff --git a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs new file mode 100644 index 000000000..387d3f84b --- /dev/null +++ b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs @@ -0,0 +1,99 @@ +// Copyright (c) 2026 AlphaSierraPapa for the SharpDevelop Team +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System; +using System.Reflection.Metadata; + +using ICSharpCode.Decompiler; +using ICSharpCode.Decompiler.IL; +using ICSharpCode.Decompiler.Metadata; +using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions; + +using ILSpy.AppEnv; +using ILSpy.AssemblyTree; +using ILSpy.Languages; + +namespace ILSpy.TreeNodes +{ + /// + /// Module reference inside . Modern .NET assemblies + /// almost never have module references (multi-file assemblies were a .NET Framework + /// feature) — the node is here for parity with the WPF host so non-PE / multi-module + /// edge cases still render correctly. + /// + sealed class ModuleReferenceTreeNode : ILSpyTreeNode + { + readonly MetadataFile module; + readonly AssemblyTreeNode parentAssembly; + readonly MetadataReader metadata; + readonly ModuleReferenceHandle handle; + readonly ModuleReference reference; + readonly string moduleName; + readonly bool containsMetadata; + + public ModuleReferenceTreeNode(AssemblyTreeNode parentAssembly, ModuleReferenceHandle r, MetadataFile module) + { + this.parentAssembly = parentAssembly ?? throw new ArgumentNullException(nameof(parentAssembly)); + if (r.IsNil) + throw new ArgumentNullException(nameof(r)); + this.handle = r; + this.module = module ?? throw new ArgumentNullException(nameof(module)); + this.metadata = module.Metadata; + this.reference = module.Metadata.GetModuleReference(r); + this.moduleName = ILAmbience.EscapeName(metadata.GetString(reference.Name)); + + foreach (var h in metadata.AssemblyFiles) + { + var file = metadata.GetAssemblyFile(h); + if (metadata.StringComparer.Equals(file.Name, moduleName)) + { + this.containsMetadata = file.ContainsMetadata; + break; + } + } + } + + public override object Text => moduleName; + + public override object Icon => Images.Images.Library; + + public override void ActivateItem(IPlatformRoutedEventArgs e) + { + if (parentAssembly.Parent is not AssemblyListTreeNode listNode || !containsMetadata) + return; + var resolver = parentAssembly.LoadedAssembly.GetAssemblyResolver(); + var mainModule = parentAssembly.LoadedAssembly.GetMetadataFileOrNull(); + if (mainModule == null) + return; + var resolved = resolver.ResolveModule(mainModule, metadata.GetString(reference.Name)); + if (resolved == null) + return; + var node = listNode.FindAssemblyNode(resolved); + if (node == null) + return; + AppComposition.Current.GetExport().SelectedItem = node; + e.Handled = true; + } + + public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) + { + output.WriteLine(moduleName); + output.WriteLine(containsMetadata ? "contains metadata" : "contains no metadata"); + } + } +} diff --git a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs index a5d5987d0..251f85e9e 100644 --- a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs +++ b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs @@ -52,6 +52,9 @@ namespace ILSpy.TreeNodes { foreach (var r in module.AssemblyReferences.OrderBy(r => r.Name)) Children.Add(new AssemblyReferenceTreeNode(r, parentAssembly)); + var metadata = module.Metadata; + foreach (var r in metadata.GetModuleReferences().OrderBy(r => metadata.GetString(metadata.GetModuleReference(r).Name))) + Children.Add(new ModuleReferenceTreeNode(parentAssembly, r, module)); } public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)