Browse Source

Display System.Void as struct

pull/1835/head
SilverFox 6 years ago
parent
commit
4575ef65d3
  1. 3
      ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
  2. 1
      ILSpy/TreeNodes/TypeTreeNode.cs

3
ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs

@ -1362,6 +1362,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax @@ -1362,6 +1362,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
ClassType classType;
switch (typeDefinition.Kind) {
case TypeKind.Struct:
case TypeKind.Void:
classType = ClassType.Struct;
modifiers &= ~Modifiers.Sealed;
if (ShowModifiers) {
@ -1420,7 +1421,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax @@ -1420,7 +1421,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
decl.BaseTypes.Add(ConvertType(typeDefinition.EnumUnderlyingType));
}
// if the declared type is a struct, ignore System.ValueType
} else if (typeDefinition.Kind == TypeKind.Struct && baseType.IsKnownType(KnownTypeCode.ValueType)) {
} else if ((typeDefinition.Kind == TypeKind.Struct || typeDefinition.Kind == TypeKind.Void) && baseType.IsKnownType(KnownTypeCode.ValueType)) {
continue;
// always ignore System.Object
} else if (baseType.IsKnownType(KnownTypeCode.Object)) {

1
ILSpy/TreeNodes/TypeTreeNode.cs

@ -122,6 +122,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -122,6 +122,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
case TypeKind.Interface:
return TypeIcon.Interface;
case TypeKind.Struct:
case TypeKind.Void:
return TypeIcon.Struct;
case TypeKind.Delegate:
return TypeIcon.Delegate;

Loading…
Cancel
Save