Add Event+Property nodes.

ILSpy/EventTreeNode.cs

@@ -0,0 +1,49 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+
+using System;
+using ICSharpCode.TreeView;
+using Mono.Cecil;
+
+namespace ICSharpCode.ILSpy
+{
+	/// <summary>
+	/// Represents an event in the TreeView.
+	/// </summary>
+	sealed class EventTreeNode : SharpTreeNode
+	{
+		readonly EventDefinition ev;
+		
+		public EventTreeNode(EventDefinition ev)
+		{
+			if (ev == null)
+				throw new ArgumentNullException("ev");
+			this.ev = ev;
+			this.LazyLoading = true;
+		}
+		
+		public override object Text {
+			get { return ev.Name + " : " + Language.Current.TypeToString(ev.EventType); }
+		}
+		
+		public override object Icon {
+			get {
+				return Images.Event;
+			}
+		}
+		
+		protected override void LoadChildren()
+		{
+			if (ev.AddMethod != null)
+				this.Children.Add(new MethodTreeNode(ev.AddMethod));
+			if (ev.RemoveMethod != null)
+				this.Children.Add(new MethodTreeNode(ev.RemoveMethod));
+			if (ev.InvokeMethod != null)
+				this.Children.Add(new MethodTreeNode(ev.InvokeMethod));
+			if (ev.HasOtherMethods) {
+				foreach (var m in ev.OtherMethods)
+					this.Children.Add(new MethodTreeNode(m));
+			}
+		}
+	}
+}

ILSpy/FieldTreeNode.cs

@@ -37,25 +37,15 @@ namespace ICSharpCode.ILSpy
 		}
 		
 		public override object Text {
-			get { return field.Name; }
+			get { return field.Name + " : " + Language.Current.TypeToString(field.FieldType); }
 		}
 		
 		public override object Icon {
 			get {
 				if (field.IsLiteral)
 					return Images.Literal;
-				switch (field.Attributes & FieldAttributes.FieldAccessMask) {
+				else
-					case FieldAttributes.Public:
+					return Images.Field;
-						return Images.Field;
-					case FieldAttributes.Assembly:
-					case FieldAttributes.FamANDAssem:
-						return Images.InternalField;
-					case FieldAttributes.Family:
-					case FieldAttributes.FamORAssem:
-						return Images.ProtectedField;
-					default:
-						return Images.PrivateField;
-				}
 			}
 		}
 	}

ILSpy/ILSpy.csproj

@@ -72,10 +72,12 @@
     <Compile Include="AssemblyReferenceTreeNode.cs" />
     <Compile Include="AssemblyTreeNode.cs" />
     <Compile Include="BaseTypesTreeNode.cs" />
+    <Compile Include="EventTreeNode.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="FieldTreeNode.cs" />
     <Compile Include="Fusion.cs" />
     <Compile Include="GacInterop.cs" />
+    <Compile Include="Language.cs" />
     <Compile Include="Images\Images.cs" />
     <Compile Include="MethodTreeNode.cs" />
     <Compile Include="ModuleReferenceTreeNode.cs" />
@@ -91,6 +93,7 @@
       <SubType>Code</SubType>
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PropertyTreeNode.cs" />
     <Compile Include="ReferenceFolderTreeNode.cs" />
     <Compile Include="SortableGridViewColumn.cs" />
     <Compile Include="TreeTraversal.cs" />
@@ -111,9 +114,7 @@
     <Resource Include="Images\InternalClass.png" />
     <Resource Include="Images\InternalDelegate.png" />
     <Resource Include="Images\InternalEnum.png" />
-    <Resource Include="Images\InternalField.png" />
     <Resource Include="Images\InternalInterface.png" />
-    <Resource Include="Images\InternalMethod.png" />
     <Resource Include="Images\InternalStruct.png" />
     <Resource Include="Images\Literal.png" />
     <Resource Include="Images\Method.png" />
@@ -122,16 +123,12 @@
     <Resource Include="Images\PrivateClass.png" />
     <Resource Include="Images\PrivateDelegate.png" />
     <Resource Include="Images\PrivateEnum.png" />
-    <Resource Include="Images\PrivateField.png" />
     <Resource Include="Images\PrivateInterface.png" />
-    <Resource Include="Images\PrivateMethod.png" />
     <Resource Include="Images\PrivateStruct.png" />
     <Resource Include="Images\ProtectedClass.png" />
     <Resource Include="Images\ProtectedDelegate.png" />
     <Resource Include="Images\ProtectedEnum.png" />
-    <Resource Include="Images\ProtectedField.png" />
     <Resource Include="Images\ProtectedInterface.png" />
-    <Resource Include="Images\ProtectedMethod.png" />
     <Resource Include="Images\ProtectedStruct.png" />
     <Resource Include="Images\Assembly.png" />
     <Resource Include="Images\Struct.png" />
@@ -163,5 +160,18 @@
     <Resource Include="Images\Redo.png" />
     <Resource Include="Images\Undo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Event.png" />
+    <Resource Include="Images\ExtensionMethod.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Indexer.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Operator.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Property.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

ILSpy/Images/Images.cs

@@ -32,30 +32,29 @@ namespace ICSharpCode.ILSpy
 		public static readonly BitmapImage Struct = LoadBitmap("Struct");
 		public static readonly BitmapImage Field = LoadBitmap("Field");
 		public static readonly BitmapImage Method = LoadBitmap("Method");
+		public static readonly BitmapImage ExtensionMethod = LoadBitmap("ExtensionMethod");
 		public static readonly BitmapImage Literal = LoadBitmap("Literal");
+		public static readonly BitmapImage Property = LoadBitmap("Property");
+		public static readonly BitmapImage Event = LoadBitmap("Event");
+		public static readonly BitmapImage Indexer = LoadBitmap("Indexer");
+		public static readonly BitmapImage Operator = LoadBitmap("Operator");
 		
 		public static readonly BitmapImage InternalClass = LoadBitmap("InternalClass");
 		public static readonly BitmapImage InternalDelegate = LoadBitmap("InternalDelegate");
 		public static readonly BitmapImage InternalEnum = LoadBitmap("InternalEnum");
 		public static readonly BitmapImage InternalInterface = LoadBitmap("InternalInterface");
 		public static readonly BitmapImage InternalStruct = LoadBitmap("InternalStruct");
-		public static readonly BitmapImage InternalField = LoadBitmap("InternalField");
-		public static readonly BitmapImage InternalMethod = LoadBitmap("InternalMethod");
 		
 		public static readonly BitmapImage PrivateClass = LoadBitmap("PrivateClass");
 		public static readonly BitmapImage PrivateDelegate = LoadBitmap("PrivateDelegate");
 		public static readonly BitmapImage PrivateEnum = LoadBitmap("PrivateEnum");
 		public static readonly BitmapImage PrivateInterface = LoadBitmap("PrivateInterface");
 		public static readonly BitmapImage PrivateStruct = LoadBitmap("PrivateStruct");
-		public static readonly BitmapImage PrivateField = LoadBitmap("PrivateField");
-		public static readonly BitmapImage PrivateMethod = LoadBitmap("PrivateMethod");
 		
 		public static readonly BitmapImage ProtectedClass = LoadBitmap("ProtectedClass");
 		public static readonly BitmapImage ProtectedDelegate = LoadBitmap("ProtectedDelegate");
 		public static readonly BitmapImage ProtectedEnum = LoadBitmap("ProtectedEnum");
 		public static readonly BitmapImage ProtectedInterface = LoadBitmap("ProtectedInterface");
 		public static readonly BitmapImage ProtectedStruct = LoadBitmap("ProtectedStruct");
-		public static readonly BitmapImage ProtectedField = LoadBitmap("ProtectedField");
-		public static readonly BitmapImage ProtectedMethod = LoadBitmap("ProtectedMethod");
 	}
 }

ILSpy/Images/TypeImages.cs

@@ -1,55 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <author name="Daniel Grunwald"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Windows.Media.Imaging;
-
-namespace ICSharpCode.ILSpy
-{
-	static class TypeImages
-	{
-		static BitmapImage LoadBitmap(string name)
-		{
-			BitmapImage image = new BitmapImage(new Uri("pack://application:,,,/Images/" + name + ".png"));
-			image.Freeze();
-			return image;
-		}
-		
-		public static readonly BitmapImage Class = LoadBitmap("Class");
-		public static readonly BitmapImage Delegate = LoadBitmap("Delegate");
-		public static readonly BitmapImage Enum = LoadBitmap("Enum");
-		public static readonly BitmapImage Interface = LoadBitmap("Interface");
-		public static readonly BitmapImage Struct = LoadBitmap("Struct");
-		public static readonly BitmapImage Field = LoadBitmap("Field");
-		public static readonly BitmapImage Method = LoadBitmap("Method");
-		public static readonly BitmapImage Literal = LoadBitmap("Literal");
-		
-		public static readonly BitmapImage InternalClass = LoadBitmap("InternalClass");
-		public static readonly BitmapImage InternalDelegate = LoadBitmap("InternalDelegate");
-		public static readonly BitmapImage InternalEnum = LoadBitmap("InternalEnum");
-		public static readonly BitmapImage InternalInterface = LoadBitmap("InternalInterface");
-		public static readonly BitmapImage InternalStruct = LoadBitmap("InternalStruct");
-		public static readonly BitmapImage InternalField = LoadBitmap("InternalField");
-		public static readonly BitmapImage InternalMethod = LoadBitmap("InternalMethod");
-		
-		public static readonly BitmapImage PrivateClass = LoadBitmap("PrivateClass");
-		public static readonly BitmapImage PrivateDelegate = LoadBitmap("PrivateDelegate");
-		public static readonly BitmapImage PrivateEnum = LoadBitmap("PrivateEnum");
-		public static readonly BitmapImage PrivateInterface = LoadBitmap("PrivateInterface");
-		public static readonly BitmapImage PrivateStruct = LoadBitmap("PrivateStruct");
-		public static readonly BitmapImage PrivateField = LoadBitmap("PrivateField");
-		public static readonly BitmapImage PrivateMethod = LoadBitmap("PrivateMethod");
-		
-		public static readonly BitmapImage ProtectedClass = LoadBitmap("ProtectedClass");
-		public static readonly BitmapImage ProtectedDelegate = LoadBitmap("ProtectedDelegate");
-		public static readonly BitmapImage ProtectedEnum = LoadBitmap("ProtectedEnum");
-		public static readonly BitmapImage ProtectedInterface = LoadBitmap("ProtectedInterface");
-		public static readonly BitmapImage ProtectedStruct = LoadBitmap("ProtectedStruct");
-		public static readonly BitmapImage ProtectedField = LoadBitmap("ProtectedField");
-		public static readonly BitmapImage ProtectedMethod = LoadBitmap("ProtectedMethod");
-	}
-}

ILSpy/Language.cs

@@ -0,0 +1,30 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+
+using System;
+using Mono.Cecil;
+
+namespace ICSharpCode.ILSpy
+{
+	/// <summary>
+	/// Description of ILanguage.
+	/// </summary>
+	public abstract class Language
+	{
+		public static readonly Language Current = Languages.IL;
+		
+		public virtual string TypeToString(TypeReference t)
+		{
+			return t.Name;
+		}
+	}
+	
+	public static class Languages
+	{
+		public static readonly Language IL = new ILLanguage();
+		
+		class ILLanguage : Language
+		{
+		}
+	}
+}

ILSpy/MethodTreeNode.cs

@@ -17,6 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Text;
 using ICSharpCode.TreeView;
 using Mono.Cecil;
 
@@ -37,23 +38,31 @@ namespace ICSharpCode.ILSpy
 		}
 		
 		public override object Text {
-			get { return method.Name; }
+			get {
+				StringBuilder b = new StringBuilder();
+				b.Append(method.Name);
+				b.Append('(');
+				for (int i = 0; i < method.Parameters.Count; i++) {
+					if (i > 0) b.Append(", ");
+					b.Append(Language.Current.TypeToString(method.Parameters[i].ParameterType));
+				}
+				b.Append(") : ");
+				b.Append(Language.Current.TypeToString(method.ReturnType));
+				return b.ToString();
+			}
 		}
 		
 		public override object Icon {
 			get {
-				switch (method.Attributes & MethodAttributes.MemberAccessMask) {
+				if (method.IsSpecialName && method.Name.StartsWith("op_", StringComparison.Ordinal))
-					case MethodAttributes.Public:
+					return Images.Operator;
-						return Images.Method;
+				if (method.IsStatic && method.HasParameters && method.Parameters[0].HasCustomAttributes) {
-					case MethodAttributes.Assembly:
+					foreach (var ca in method.Parameters[0].CustomAttributes) {
-					case MethodAttributes.FamANDAssem:
+						if (ca.AttributeType.FullName == "System.Runtime.CompilerServices.ExtensionAttribute")
-						return Images.InternalMethod;
+							return Images.ExtensionMethod;
-					case MethodAttributes.Family:
+					}
-					case MethodAttributes.FamORAssem:
-						return Images.ProtectedMethod;
-					default:
-						return Images.PrivateMethod;
 				}
+				return Images.Method;
 			}
 		}
 	}

ILSpy/PropertyTreeNode.cs

@@ -0,0 +1,49 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+
+using System;
+using ICSharpCode.TreeView;
+using Mono.Cecil;
+
+namespace ICSharpCode.ILSpy
+{
+	/// <summary>
+	/// Represents a property in the TreeView.
+	/// </summary>
+	sealed class PropertyTreeNode : SharpTreeNode
+	{
+		readonly PropertyDefinition property;
+		readonly bool isIndexer;
+		
+		public PropertyTreeNode(PropertyDefinition property, bool isIndexer)
+		{
+			if (property == null)
+				throw new ArgumentNullException("property");
+			this.property = property;
+			this.isIndexer = isIndexer;
+			this.LazyLoading = true;
+		}
+		
+		public override object Text {
+			get { return property.Name + " : " + Language.Current.TypeToString(property.PropertyType); }
+		}
+		
+		public override object Icon {
+			get {
+				return isIndexer ? Images.Indexer : Images.Property;
+			}
+		}
+		
+		protected override void LoadChildren()
+		{
+			if (property.GetMethod != null)
+				this.Children.Add(new MethodTreeNode(property.GetMethod));
+			if (property.SetMethod != null)
+				this.Children.Add(new MethodTreeNode(property.SetMethod));
+			if (property.HasOtherMethods) {
+				foreach (var m in property.OtherMethods)
+					this.Children.Add(new MethodTreeNode(m));
+			}
+		}
+	}
+}

ILSpy/TypeTreeNode.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows.Media;
 
 using ICSharpCode.TreeView;
@@ -74,8 +75,39 @@ namespace ICSharpCode.ILSpy
 			foreach (FieldDefinition field in type.Fields) {
 				this.Children.Add(new FieldTreeNode(field));
 			}
+			HashSet<MethodDefinition> accessorMethods = new HashSet<MethodDefinition>();
+			
+			// figure out the name of the indexer:
+			string defaultMemberName = null;
+			var defaultMemberAttribute = type.CustomAttributes.FirstOrDefault(
+				a => a.AttributeType.FullName == typeof(System.Reflection.DefaultMemberAttribute).FullName);
+			if (defaultMemberAttribute != null && defaultMemberAttribute.ConstructorArguments.Count == 1) {
+				defaultMemberName = defaultMemberAttribute.ConstructorArguments[0].Value as string;
+			}
+			
+			foreach (PropertyDefinition property in type.Properties) {
+				this.Children.Add(new PropertyTreeNode(property, property.Name == defaultMemberName));
+				accessorMethods.Add(property.GetMethod);
+				accessorMethods.Add(property.SetMethod);
+				if (property.HasOtherMethods) {
+					foreach (var m in property.OtherMethods)
+						accessorMethods.Add(m);
+				}
+			}
+			foreach (EventDefinition ev in type.Events) {
+				this.Children.Add(new EventTreeNode(ev));
+				accessorMethods.Add(ev.AddMethod);
+				accessorMethods.Add(ev.RemoveMethod);
+				accessorMethods.Add(ev.InvokeMethod);
+				if (ev.HasOtherMethods) {
+					foreach (var m in ev.OtherMethods)
+						accessorMethods.Add(m);
+				}
+			}
 			foreach (MethodDefinition method in type.Methods) {
-				this.Children.Add(new MethodTreeNode(method));
+				if (!accessorMethods.Contains(method)) {
+					this.Children.Add(new MethodTreeNode(method));
+				}
 			}
 		}