Disassemble assembly header.

ILSpy/AssemblyTreeNode.cs

@@ -209,5 +209,10 @@ namespace ICSharpCode.ILSpy
 			else
 				return FilterResult.Recurse;
 		}
+		
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
+		{
+			language.DecompileAssembly(assemblyTask.Result, output, options);
+		}
 	}
 }

ILSpy/DecompilationOptions.cs

@@ -0,0 +1,25 @@
+// 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 System.Threading;
+
+namespace ICSharpCode.ILSpy
+{
+	/// <summary>
+	/// Options passed to the decompiler.
+	/// </summary>
+	public class DecompilationOptions
+	{
+		/// <summary>
+		/// Gets whether a full decompilation (all members recursively) is desired.
+		/// If this option is false, language bindings are allowed to show the only headers of the decompiled element's children.
+		/// </summary>
+		public bool FullDecompilation { get; set; }
+		
+		/// <summary>
+		/// Gets the cancellation token that is used to abort the decompiler.
+		/// </summary>
+		public CancellationToken CancellationToken { get; set; }
+	}
+}

ILSpy/Decompiler/CSharpLanguage.cs

@@ -17,12 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.IO;
-using System.Threading;
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.FlowAnalysis;
 using Mono.Cecil;
-using Mono.Cecil.Rocks;
 
 namespace ICSharpCode.ILSpy.Decompiler
 {
@@ -35,7 +30,7 @@ namespace ICSharpCode.ILSpy.Decompiler
 			get { return "C#"; }
 		}
 		
-		public override void Decompile(MethodDefinition method, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileMethod(MethodDefinition method, ITextOutput output, DecompilationOptions options)
 		{
 			throw new NotImplementedException();
 		}

ILSpy/Disassembler/DisassemblerHelpers.cs

@@ -86,9 +86,11 @@ namespace ICSharpCode.ILSpy.Disassembler
 		
 		public static void WriteTo(this MethodReference method, ITextOutput writer)
 		{
+			if (method.HasThis)
+				writer.Write("instance ");
 			method.ReturnType.WriteTo(writer);
 			writer.Write(' ');
-			method.DeclaringType.WriteTo(writer);
+			method.DeclaringType.WriteTo(writer, true);
 			writer.Write("::");
 			writer.WriteReference(method.Name, method);
 			writer.Write("(");

ILSpy/Disassembler/ILLanguage.cs

@@ -5,7 +5,7 @@
 // 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:
-// 4
+// 
 // The above copyright notice and this permission notice shall be included in all copies or
 // substantial portions of the Software.
 // 
@@ -17,14 +17,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.ComponentModel;
+using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-
-using ICSharpCode.Decompiler;
-using ICSharpCode.Decompiler.FlowAnalysis;
 using Mono.Cecil;
-using Mono.Cecil.Rocks;
 
 namespace ICSharpCode.ILSpy.Disassembler
 {
@@ -45,29 +39,39 @@ namespace ICSharpCode.ILSpy.Disassembler
 			get { return ICSharpCode.AvalonEdit.Highlighting.HighlightingManager.Instance.GetDefinition("ILAsm"); }
 		}
 		
-		public override void Decompile(MethodDefinition method, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileMethod(MethodDefinition method, ITextOutput output, DecompilationOptions options)
+		{
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleMethod(method);
+		}
+		
+		public override void DecompileField(FieldDefinition field, ITextOutput output, DecompilationOptions options)
+		{
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleField(field);
+		}
+		
+		public override void DecompileProperty(PropertyDefinition property, ITextOutput output, DecompilationOptions options)
 		{
-			new ReflectionDisassembler(output, detectControlStructure, cancellationToken).DisassembleMethod(method);
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleProperty(property);
 		}
 		
-		public override void Decompile(FieldDefinition field, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileEvent(EventDefinition ev, ITextOutput output, DecompilationOptions options)
 		{
-			new ReflectionDisassembler(output, detectControlStructure, cancellationToken).DisassembleField(field);
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleEvent(ev);
 		}
 		
-		public override void Decompile(PropertyDefinition property, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileType(TypeDefinition type, ITextOutput output, DecompilationOptions options)
 		{
-			new ReflectionDisassembler(output, detectControlStructure, cancellationToken).DisassembleProperty(property);
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleType(type);
 		}
 		
-		public override void Decompile(EventDefinition ev, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileNamespace(string nameSpace, IEnumerable<TypeDefinition> types, ITextOutput output, DecompilationOptions options)
 		{
-			new ReflectionDisassembler(output, detectControlStructure, cancellationToken).DisassembleEvent(ev);
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).DisassembleNamespace(nameSpace, types);
 		}
 		
-		public override void Decompile(TypeDefinition type, ITextOutput output, CancellationToken cancellationToken)
+		public override void DecompileAssembly(AssemblyDefinition assembly, ITextOutput output, DecompilationOptions options)
 		{
-			new ReflectionDisassembler(output, detectControlStructure, cancellationToken).DisassembleType(type);
+			new ReflectionDisassembler(output, detectControlStructure, options.CancellationToken).WriteAssemblyHeader(assembly);
 		}
 		
 		public override string TypeToString(TypeReference t)

ILSpy/Disassembler/MethodBodyDisassembler.cs

@@ -5,7 +5,7 @@
 // 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:
-// 4
+// 
 // The above copyright notice and this permission notice shall be included in all copies or
 // substantial portions of the Software.
 // 

ILSpy/Disassembler/ReflectionDisassembler.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// 
+// 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.Collections.Generic;
@@ -73,6 +88,8 @@ namespace ICSharpCode.ILSpy.Disassembler
 		
 		EnumNameCollection<MethodImplAttributes> methodImpl = new EnumNameCollection<MethodImplAttributes>() {
 			{ MethodImplAttributes.Synchronized, "synchronized" },
+			{ MethodImplAttributes.NoInlining, "noinlining" },
+			{ MethodImplAttributes.NoOptimization, "nooptimization" },
 		};
 		
 		public void DisassembleMethod(MethodDefinition method)
@@ -131,7 +148,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 			if (method.HasBody)
 				methodBodyDisassembler.Disassemble(method.Body);
 			
-			CloseBlock();
+			CloseBlock("End of method " + method.DeclaringType.Name + "." + method.Name);
 		}
 		
 		void WriteParameters(Collection<ParameterDefinition> parameters)
@@ -248,7 +265,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 		}
 		#endregion
 		
-		#region Disassembly Type
+		#region Disassemble Type
 		EnumNameCollection<TypeAttributes> typeVisibility = new EnumNameCollection<TypeAttributes>() {
 			{ TypeAttributes.Public, "public" },
 			{ TypeAttributes.NotPublic, "private" },
@@ -299,7 +316,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 				output.WriteLine();
 				output.Indent();
 				output.Write("extends ");
-				type.BaseType.WriteTo(output);
+				type.BaseType.WriteTo(output, true);
 				output.Unindent();
 			}
 			
@@ -317,6 +334,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 				foreach (var nestedType in type.NestedTypes) {
 					cancellationToken.ThrowIfCancellationRequested();
 					DisassembleType(nestedType);
+					output.WriteLine();
 				}
 				output.WriteLine();
 			}
@@ -358,7 +376,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 				}
 				output.WriteLine();
 			}
-			CloseBlock();
+			CloseBlock("// End of class " + type.FullName);
 			isInType = oldIsInType;
 		}
 		#endregion
@@ -405,10 +423,12 @@ namespace ICSharpCode.ILSpy.Disassembler
 			output.Indent();
 		}
 		
-		void CloseBlock()
+		void CloseBlock(string comment = null)
 		{
 			output.Unindent();
 			output.Write("}");
+			if (comment != null)
+				output.Write("// " + comment);
 			output.MarkFoldEnd();
 			output.WriteLine();
 		}
@@ -425,7 +445,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 				}
 			}
 			if ((val & ~tested) != 0)
-				output.Write("flag({0}) ", val & ~tested);
+				output.Write("flag({0:x4}) ", val & ~tested);
 		}
 		
 		void WriteEnum<T>(T enumValue, EnumNameCollection<T> enumNames) where T : struct
@@ -439,7 +459,7 @@ namespace ICSharpCode.ILSpy.Disassembler
 				}
 			}
 			if (val != 0) {
-				output.Write("flag({0})", val);
+				output.Write("flag({0:x4})", val);
 				output.Write(' ');
 			}
 			
@@ -465,5 +485,47 @@ namespace ICSharpCode.ILSpy.Disassembler
 			}
 		}
 		#endregion
+		
+		public void DisassembleNamespace(string nameSpace, IEnumerable<TypeDefinition> types)
+		{
+			if (!string.IsNullOrEmpty(nameSpace)) {
+				output.Write(".namespace " + DisassemblerHelpers.Escape(nameSpace));
+				OpenBlock(false);
+			}
+			bool oldIsInType = isInType;
+			isInType = true;
+			foreach (TypeDefinition td in types) {
+				cancellationToken.ThrowIfCancellationRequested();
+				DisassembleType(td);
+				output.WriteLine();
+			}
+			if (!string.IsNullOrEmpty(nameSpace)) {
+				CloseBlock();
+				isInType = oldIsInType;
+			}
+		}
+		
+		public void WriteAssemblyHeader(AssemblyDefinition asm)
+		{
+			output.Write(".assembly " + DisassemblerHelpers.Escape(asm.Name.Name));
+			OpenBlock(false);
+			Version v = asm.Name.Version;
+			if (v != null) {
+				output.WriteLine(".ver {0}:{1}:{2}:{3}", v.Major, v.Minor, v.Build, v.Revision);
+			}
+			if (asm.Name.HashAlgorithm != AssemblyHashAlgorithm.None) {
+				output.Write(".hash algorithm 0x{0:x8}", (int)asm.Name.HashAlgorithm);
+				if (asm.Name.HashAlgorithm == AssemblyHashAlgorithm.SHA1)
+					output.Write(" // SHA1");
+				output.WriteLine();
+			}
+			if (asm.Name.PublicKey != null && asm.Name.PublicKey.Length > 0) {
+				output.Write(".publickey = ");
+				WriteBlob(asm.Name.PublicKey);
+				output.WriteLine();
+			}
+			WriteAttributes(asm.CustomAttributes);
+			CloseBlock();
+		}
 	}
 }

ILSpy/EventTreeNode.cs

@@ -17,8 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -74,9 +72,9 @@ namespace ICSharpCode.ILSpy
 				return FilterResult.Hidden;
 		}
 		
-		public override void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.Decompile(ev, output, cancellationToken);
+			language.DecompileEvent(ev, output, options);
 		}
 	}
 }

ILSpy/FieldTreeNode.cs

@@ -17,8 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -62,9 +60,9 @@ namespace ICSharpCode.ILSpy
 				return FilterResult.Hidden;
 		}
 		
-		public override void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.Decompile(field, output, cancellationToken);
+			language.DecompileField(field, output, options);
 		}
 	}
 }

ILSpy/ILSpy.csproj

@@ -86,6 +86,7 @@
     <Compile Include="AssemblyTreeNode.cs" />
     <Compile Include="BaseTypesTreeNode.cs" />
     <Compile Include="CueBannerService.cs" />
+    <Compile Include="DecompilationOptions.cs" />
     <Compile Include="Decompiler\CSharpLanguage.cs" />
     <Compile Include="Disassembler\DisassemblerHelpers.cs" />
     <Compile Include="Disassembler\ILLanguage.cs" />

ILSpy/ILSpyTreeNode.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Threading;
 
 using ICSharpCode.TreeView;
 
@@ -54,7 +53,7 @@ namespace ICSharpCode.ILSpy
 				return FilterResult.Hidden;
 		}
 		
-		public virtual void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
 		}
 	}

ILSpy/Language.cs

@@ -17,13 +17,14 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
 {
 	/// <summary>
-	/// Description of ILanguage.
+	/// Base class for language-specific decompiler implementations.
 	/// </summary>
 	public abstract class Language
 	{
@@ -35,23 +36,31 @@ namespace ICSharpCode.ILSpy
 			get { return ICSharpCode.AvalonEdit.Highlighting.HighlightingManager.Instance.GetDefinition(this.Name); }
 		}
 		
-		public virtual void Decompile(MethodDefinition method, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void DecompileMethod(MethodDefinition method, ITextOutput output, DecompilationOptions options)
 		{
 		}
 		
-		public virtual void Decompile(PropertyDefinition property, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void DecompileProperty(PropertyDefinition property, ITextOutput output, DecompilationOptions options)
 		{
 		}
 		
-		public virtual void Decompile(FieldDefinition field, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void DecompileField(FieldDefinition field, ITextOutput output, DecompilationOptions options)
 		{
 		}
 		
-		public virtual void Decompile(EventDefinition ev, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void DecompileEvent(EventDefinition ev, ITextOutput output, DecompilationOptions options)
 		{
 		}
 		
-		public virtual void Decompile(TypeDefinition type, ITextOutput output, CancellationToken cancellationToken)
+		public virtual void DecompileType(TypeDefinition type, ITextOutput output, DecompilationOptions options)
+		{
+		}
+		
+		public virtual void DecompileNamespace(string nameSpace, IEnumerable<TypeDefinition> types, ITextOutput output, DecompilationOptions options)
+		{
+		}
+		
+		public virtual void DecompileAssembly(AssemblyDefinition assembly, ITextOutput output, DecompilationOptions options)
 		{
 		}
 		

ILSpy/MethodTreeNode.cs

@@ -18,9 +18,6 @@
 
 using System;
 using System.Text;
-using System.Threading;
-
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -72,9 +69,9 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
-		public override void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.Decompile(method, output, cancellationToken);
+			language.DecompileMethod(method, output, options);
 		}
 		
 		public override FilterResult Filter(FilterSettings settings)

ILSpy/NamespaceTreeNode.cs

@@ -17,8 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.ObjectModel;
+using System.Linq;
-using ICSharpCode.TreeView;
 
 namespace ICSharpCode.ILSpy
 {
@@ -52,5 +51,10 @@ namespace ICSharpCode.ILSpy
 			else
 				return FilterResult.Recurse;
 		}
+		
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
+		{
+			language.DecompileNamespace(name, this.Children.Select(t => t.TypeDefinition), output, options);
+		}
 	}
 }

ILSpy/PropertyTreeNode.cs

@@ -17,8 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -74,9 +72,9 @@ namespace ICSharpCode.ILSpy
 				return FilterResult.Hidden;
 		}
 		
-		public override void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.Decompile(property, output, cancellationToken);
+			language.DecompileProperty(property, output, options);
 		}
 	}
 }

ILSpy/TextView/DecompilerTextView.cs

@@ -1,5 +1,20 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
-// This code is distributed under MIT X11 license (for details please see \doc\license.txt)
+// 
+// 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.Collections.Generic;
@@ -12,7 +27,7 @@ using System.Windows.Controls;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
 using System.Xml;
-using ICSharpCode.AvalonEdit;
+
 using ICSharpCode.AvalonEdit.Folding;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
@@ -63,7 +78,11 @@ namespace ICSharpCode.ILSpy.TextView
 			// cancel the previous only after current was set to the new one (avoid that the old one still finishes successfully)
 			if (previousCancellationTokenSource != null)
 				previousCancellationTokenSource.Cancel();
-			var task = RunDecompiler(ILSpy.Language.Current, treeNodes.ToArray(), myCancellationTokenSource.Token);
+			
+			DecompilationOptions options = new DecompilationOptions();
+			options.CancellationToken = myCancellationTokenSource.Token;
+			
+			var task = RunDecompiler(ILSpy.Language.Current, treeNodes.ToArray(), options);
 			Action continuation = delegate {
 				try {
 					if (currentCancellationTokenSource == myCancellationTokenSource) {
@@ -97,14 +116,14 @@ namespace ICSharpCode.ILSpy.TextView
 			task.ContinueWith(delegate { Dispatcher.BeginInvoke(DispatcherPriority.Normal, continuation); });
 		}
 		
-		static Task<SmartTextOutput> RunDecompiler(ILSpy.Language language, ILSpyTreeNodeBase[] nodes, CancellationToken cancellationToken)
+		static Task<SmartTextOutput> RunDecompiler(ILSpy.Language language, ILSpyTreeNodeBase[] nodes, DecompilationOptions options)
 		{
 			return Task.Factory.StartNew(
 				delegate {
 					SmartTextOutput textOutput = new SmartTextOutput();
 					foreach (var node in nodes) {
-						cancellationToken.ThrowIfCancellationRequested();
+						options.CancellationToken.ThrowIfCancellationRequested();
-						node.Decompile(language, textOutput, cancellationToken);
+						node.Decompile(language, textOutput, options);
 					}
 					return textOutput;
 				});

ILSpy/TextView/DecompilerTextView.xaml

@@ -13,7 +13,7 @@
 			IsReadOnly="True"
 			Background="{DynamicResource {x:Static SystemColors.InfoBrushKey}}"
 			Foreground="{DynamicResource {x:Static SystemColors.InfoTextBrushKey}}" />
-		<Border Name="waitAdorner" Background="#80FFFFFF">
+		<Border Name="waitAdorner" Background="#C0FFFFFF">
 			<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
 				<TextBlock FontSize="14pt">Decompiling...</TextBlock>
 				<ProgressBar IsIndeterminate="True" Height="16" Margin="0, 4" />

ILSpy/TypeTreeNode.cs

@@ -18,12 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading;
 using System.Windows.Media;
 
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -121,9 +118,9 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
-		public override void Decompile(Language language, ITextOutput output, CancellationToken cancellationToken)
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.Decompile(type, output, cancellationToken);
+			language.DecompileType(type, output, options);
 		}
 		
 		#region Icon