Skip to content

Commit 58c5ca8

Browse files
WIP
1 parent 7ad4ccc commit 58c5ca8

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

ILSpy/TreeNodes/EventTreeNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static object GetText(IEvent ev, Language language)
6565

6666
public static ImageSource GetIcon(IEvent @event)
6767
{
68-
return Images.GetIcon(MemberIcon.Event, MethodTreeNode.GetOverlayIcon(@event.Accessibility), @event.IsStatic);
68+
return Images.GetIcon(MemberIcon.Event, Images.GetOverlayIcon(@event.Accessibility), @event.IsStatic);
6969
}
7070

7171
public override FilterResult Filter(LanguageSettings settings)

ILSpy/TreeNodes/FieldTreeNode.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ public static object GetText(IField field, Language language)
5858
public static ImageSource GetIcon(IField field)
5959
{
6060
if (field.DeclaringType.Kind == TypeKind.Enum && field.ReturnType.Kind == TypeKind.Enum)
61-
return Images.GetIcon(MemberIcon.EnumValue, MethodTreeNode.GetOverlayIcon(field.Accessibility), false);
61+
return Images.GetIcon(MemberIcon.EnumValue, Images.GetOverlayIcon(field.Accessibility), false);
6262

6363
if (field.IsConst)
64-
return Images.GetIcon(MemberIcon.Literal, MethodTreeNode.GetOverlayIcon(field.Accessibility), false);
64+
return Images.GetIcon(MemberIcon.Literal, Images.GetOverlayIcon(field.Accessibility), false);
6565

6666
if (field.IsReadOnly)
67-
return Images.GetIcon(MemberIcon.FieldReadOnly, MethodTreeNode.GetOverlayIcon(field.Accessibility), field.IsStatic);
67+
return Images.GetIcon(MemberIcon.FieldReadOnly, Images.GetOverlayIcon(field.Accessibility), field.IsStatic);
6868

69-
return Images.GetIcon(MemberIcon.Field, MethodTreeNode.GetOverlayIcon(field.Accessibility), field.IsStatic);
69+
return Images.GetIcon(MemberIcon.Field, Images.GetOverlayIcon(field.Accessibility), field.IsStatic);
7070
}
7171

7272
public override FilterResult Filter(LanguageSettings settings)

ILSpy/TreeNodes/MethodTreeNode.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ public static object GetText(IMethod method, Language language)
5858
public static ImageSource GetIcon(IMethod method)
5959
{
6060
if (method.IsOperator)
61-
return Images.GetIcon(MemberIcon.Operator, GetOverlayIcon(method.Accessibility), false);
61+
return Images.GetIcon(MemberIcon.Operator, Images.GetOverlayIcon(method.Accessibility), false);
6262

6363
if (method.IsExtensionMethod)
64-
return Images.GetIcon(MemberIcon.ExtensionMethod, GetOverlayIcon(method.Accessibility), false);
64+
return Images.GetIcon(MemberIcon.ExtensionMethod, Images.GetOverlayIcon(method.Accessibility), false);
6565

6666
if (method.IsConstructor)
67-
return Images.GetIcon(MemberIcon.Constructor, GetOverlayIcon(method.Accessibility), method.IsStatic);
67+
return Images.GetIcon(MemberIcon.Constructor, Images.GetOverlayIcon(method.Accessibility), method.IsStatic);
6868

6969
if (!method.HasBody && method.HasAttribute(KnownAttribute.DllImport))
70-
return Images.GetIcon(MemberIcon.PInvokeMethod, GetOverlayIcon(method.Accessibility), true);
70+
return Images.GetIcon(MemberIcon.PInvokeMethod, Images.GetOverlayIcon(method.Accessibility), true);
7171

7272
return Images.GetIcon(method.IsVirtual ? MemberIcon.VirtualMethod : MemberIcon.Method,
73-
GetOverlayIcon(method.Accessibility), method.IsStatic);
73+
Images.GetOverlayIcon(method.Accessibility), method.IsStatic);
7474
}
7575

7676
public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)

ILSpy/TreeNodes/PropertyTreeNode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static object GetText(IProperty property, Language language)
6868
public static ImageSource GetIcon(IProperty property)
6969
{
7070
return Images.GetIcon(property.IsIndexer ? MemberIcon.Indexer : MemberIcon.Property,
71-
MethodTreeNode.GetOverlayIcon(property.Accessibility), property.IsStatic);
71+
Images.GetOverlayIcon(property.Accessibility), property.IsStatic);
7272
}
7373

7474
public override FilterResult Filter(LanguageSettings settings)

ILSpy/ViewModels/CompareViewModel.cs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,25 @@ protected override void LoadChildren()
423423

424424
public override object Text => entry.Signature;
425425

426-
public override object Icon => Images.GetIcon(;
426+
public override object Icon {
427+
get {
428+
switch (entry.Entity)
429+
{
430+
case ITypeDefinition t:
431+
return TypeTreeNode.GetIcon(t);
432+
case IMethod m:
433+
return MethodTreeNode.GetIcon(m);
434+
case IField f:
435+
return FieldTreeNode.GetIcon(f);
436+
case IProperty p:
437+
return PropertyTreeNode.GetIcon(p);
438+
case IEvent e:
439+
return EventTreeNode.GetIcon(e);
440+
default:
441+
throw new NotSupportedException();
442+
}
443+
}
444+
}
427445

428446
public DiffKind Difference => entry.Kind;
429447

0 commit comments

Comments
 (0)