pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ExportedTypes, TypeReference and MemberReferences: Use UnknownType/FakeMember for pretty-printing of signatures in TreeView.

pull/3092/head
Siegfried Pammer 2 years ago
parent
63224425fe
commit
f93c478a6d
6 changed files with 40 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      ILSpy/TreeNodes/AssemblyReferenceReferencedTypesTreeNode.cs
  2. 8
      ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
  3. 12
      ILSpy/TreeNodes/ExportedTypeTreeNode.cs
  4. 19
      ILSpy/TreeNodes/MemberReferenceTreeNode.cs
  5. 4
      ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
  6. 13
      ILSpy/TreeNodes/TypeReferenceTreeNode.cs

7
ILSpy/TreeNodes/AssemblyReferenceReferencedTypesTreeNode.cs
Unescape View File

@ -20,6 +20,7 @@ using System;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
@ -28,10 +29,10 @@ namespace ICSharpCode.ILSpy.TreeNodes
/// </summary> /// </summary>
public sealed class AssemblyReferenceReferencedTypesTreeNode : ILSpyTreeNode public sealed class AssemblyReferenceReferencedTypesTreeNode : ILSpyTreeNode
{ {
private readonly PEFile module; readonly MetadataModule module;
private readonly AssemblyReference r; readonly AssemblyReference r;
public AssemblyReferenceReferencedTypesTreeNode(PEFile module, AssemblyReference r) public AssemblyReferenceReferencedTypesTreeNode(MetadataModule module, AssemblyReference r)
{ {
this.module = module ?? throw new ArgumentNullException(nameof(module)); this.module = module ?? throw new ArgumentNullException(nameof(module));
this.r = r ?? throw new ArgumentNullException(nameof(r)); this.r = r ?? throw new ArgumentNullException(nameof(r));

8
ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
Unescape View File

@ -21,6 +21,7 @@ using System.Windows.Threading;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
@ -29,11 +30,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
/// </summary> /// </summary>
public sealed class AssemblyReferenceTreeNode : ILSpyTreeNode public sealed class AssemblyReferenceTreeNode : ILSpyTreeNode
{ {
readonly PEFile module; readonly MetadataModule module;
readonly AssemblyReference r; readonly AssemblyReference r;
readonly AssemblyTreeNode parentAssembly; readonly AssemblyTreeNode parentAssembly;
public AssemblyReferenceTreeNode(PEFile module, AssemblyReference r, AssemblyTreeNode parentAssembly) public AssemblyReferenceTreeNode(MetadataModule module, AssemblyReference r, AssemblyTreeNode parentAssembly)
{ {
this.module = module ?? throw new ArgumentNullException(nameof(module)); this.module = module ?? throw new ArgumentNullException(nameof(module));
this.r = r ?? throw new ArgumentNullException(nameof(r)); this.r = r ?? throw new ArgumentNullException(nameof(r));
@ -83,8 +84,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
var referencedModule = resolver.Resolve(r); var referencedModule = resolver.Resolve(r);
if (referencedModule != null) if (referencedModule != null)
{ {
var module = (MetadataModule)referencedModule.GetTypeSystemWithCurrentOptionsOrNull().MainModule;
foreach (var childRef in referencedModule.AssemblyReferences) foreach (var childRef in referencedModule.AssemblyReferences)
this.Children.Add(new AssemblyReferenceTreeNode(referencedModule, childRef, parentAssembly)); this.Children.Add(new AssemblyReferenceTreeNode(module, childRef, parentAssembly));
} }
} }

12
ILSpy/TreeNodes/ExportedTypeTreeNode.cs
Unescape View File

@ -29,19 +29,21 @@ namespace ICSharpCode.ILSpy.TreeNodes
/// </summary> /// </summary>
public sealed class ExportedTypeTreeNode : ILSpyTreeNode public sealed class ExportedTypeTreeNode : ILSpyTreeNode
{ {
readonly PEFile module; readonly MetadataModule module;
private readonly ExportedTypeMetadata r; readonly ExportedTypeMetadata r;
readonly IType resolvedType;
public ExportedTypeTreeNode(PEFile module, ExportedTypeMetadata r) public ExportedTypeTreeNode(MetadataModule module, ExportedTypeMetadata r)
{ {
this.module = module ?? throw new ArgumentNullException(nameof(module)); this.module = module ?? throw new ArgumentNullException(nameof(module));
this.r = r ?? throw new ArgumentNullException(nameof(r)); this.r = r ?? throw new ArgumentNullException(nameof(r));
this.resolvedType = module.ResolveType(r.Handle, default);
this.LazyLoading = true; this.LazyLoading = true;
} }
public override object Text public override object Text
=> Language.GetEntityName(module, r.Handle, fullName: true, omitGenerics: false) + GetSuffixString(r.Handle); => Language.TypeToString(resolvedType, includeNamespace: true) + GetSuffixString(r.Handle);
public override object Icon => Images.Library; public override object Icon => Images.Library;
@ -55,7 +57,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
{ {
language.WriteCommentLine(output, $"{Language.GetEntityName(module, r.Handle, fullName: true, omitGenerics: false)} (Exported, IsForwarder: {r.IsForwarder}, Attributes: {r.Attributes})"); language.WriteCommentLine(output, $"{Language.TypeToString(resolvedType, includeNamespace: true)} (Exported, IsForwarder: {r.IsForwarder}, Attributes: {(int)r.Attributes:X8})");
} }
} }
} }

19
ILSpy/TreeNodes/MemberReferenceTreeNode.cs
Unescape View File

@ -23,6 +23,7 @@ using System.Reflection.Metadata;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
@ -31,16 +32,22 @@ namespace ICSharpCode.ILSpy.TreeNodes
/// </summary> /// </summary>
public sealed class MemberReferenceTreeNode : ILSpyTreeNode public sealed class MemberReferenceTreeNode : ILSpyTreeNode
{ {
readonly PEFile module; readonly MetadataModule module;
private readonly MemberReferenceMetadata r; readonly MemberReferenceMetadata r;
readonly IMember resolvedMember;
public MemberReferenceTreeNode(PEFile module, MemberReferenceMetadata r) public MemberReferenceTreeNode(MetadataModule module, MemberReferenceMetadata r)
{ {
this.module = module ?? throw new ArgumentNullException(nameof(module)); this.module = module ?? throw new ArgumentNullException(nameof(module));
this.r = r; this.r = r;
this.resolvedMember = r.MemberReferenceKind switch {
MemberReferenceKind.Method => module.ResolveMethod(r.Handle, default),
MemberReferenceKind.Field => (IMember)module.ResolveEntity(r.Handle),
_ => throw new NotSupportedException(),
};
} }
public override object Text => r.Name + GetSuffixString(r.Handle); public override object Text => Signature + GetSuffixString(r.Handle);
public override object Icon => r.MemberReferenceKind switch { public override object Icon => r.MemberReferenceKind switch {
MemberReferenceKind.Method => Images.Method, MemberReferenceKind.Method => Images.Method,
@ -48,13 +55,13 @@ namespace ICSharpCode.ILSpy.TreeNodes
_ => Images.Class, _ => Images.Class,
}; };
public string Signature => Language.GetEntityName(module, r.Handle, fullName: true, omitGenerics: false); public string Signature => resolvedMember is IMethod m ? Language.MethodToString(m, false, false, false) : Language.FieldToString((IField)resolvedMember, false, false, false);
public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
{ {
language.WriteCommentLine(output, Signature); language.WriteCommentLine(output, Signature);
} }
public override object ToolTip => Signature; public override object ToolTip => Language.GetRichTextTooltip(resolvedMember);
} }
} }

4
ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
Unescape View File

@ -22,6 +22,7 @@ using System.Windows.Threading;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Properties; using ICSharpCode.ILSpy.Properties;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
@ -48,8 +49,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
protected override void LoadChildren() protected override void LoadChildren()
{ {
var metadata = module.Metadata; var metadata = module.Metadata;
var metadataModule = (MetadataModule)module.GetTypeSystemWithCurrentOptionsOrNull().MainModule;
foreach (var r in module.AssemblyReferences.OrderBy(r => r.Name)) foreach (var r in module.AssemblyReferences.OrderBy(r => r.Name))
this.Children.Add(new AssemblyReferenceTreeNode(module, r, parentAssembly)); this.Children.Add(new AssemblyReferenceTreeNode(metadataModule, r, parentAssembly));
foreach (var r in metadata.GetModuleReferences().OrderBy(r => metadata.GetString(metadata.GetModuleReference(r).Name))) foreach (var r in metadata.GetModuleReferences().OrderBy(r => metadata.GetString(metadata.GetModuleReference(r).Name)))
this.Children.Add(new ModuleReferenceTreeNode(parentAssembly, r, module)); this.Children.Add(new ModuleReferenceTreeNode(parentAssembly, r, module));
} }

13
ILSpy/TreeNodes/TypeReferenceTreeNode.cs
Unescape View File

@ -20,6 +20,7 @@ using System;
using ICSharpCode.Decompiler; using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata; using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
namespace ICSharpCode.ILSpy.TreeNodes namespace ICSharpCode.ILSpy.TreeNodes
{ {
@ -28,19 +29,21 @@ namespace ICSharpCode.ILSpy.TreeNodes
/// </summary> /// </summary>
public sealed class TypeReferenceTreeNode : ILSpyTreeNode public sealed class TypeReferenceTreeNode : ILSpyTreeNode
{ {
readonly PEFile module; readonly MetadataModule module;
private readonly TypeReferenceMetadata r; readonly TypeReferenceMetadata r;
readonly IType resolvedType;
public TypeReferenceTreeNode(PEFile module, TypeReferenceMetadata r) public TypeReferenceTreeNode(MetadataModule module, TypeReferenceMetadata r)
{ {
this.module = module ?? throw new ArgumentNullException(nameof(module)); this.module = module ?? throw new ArgumentNullException(nameof(module));
this.r = r ?? throw new ArgumentNullException(nameof(r)); this.r = r ?? throw new ArgumentNullException(nameof(r));
this.resolvedType = module.ResolveType(r.Handle, default);
this.LazyLoading = true; this.LazyLoading = true;
} }
public override object Text public override object Text
=> Language.GetEntityName(module, r.Handle, fullName: true, omitGenerics: false) + GetSuffixString(r.Handle); => Language.TypeToString(resolvedType, includeNamespace: false) + GetSuffixString(r.Handle);
public override object Icon => Images.Class; public override object Icon => Images.Class;
@ -57,7 +60,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
public override void Decompile(Language language, ITextOutput output, DecompilationOptions options) public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
{ {
language.WriteCommentLine(output, $"{Language.GetEntityName(module, r.Handle, fullName: true, omitGenerics: false)}"); language.WriteCommentLine(output, Language.TypeToString(resolvedType, includeNamespace: true));
EnsureLazyChildren(); EnsureLazyChildren();
foreach (ILSpyTreeNode child in Children) foreach (ILSpyTreeNode child in Children)
{ {

Write Preview
Loading…
Cancel
Save