Code Tidy: Mark fields read-only where appropriate

remove redundant using statements
remove redundant qualifiers

ILSpy/Commands/CommandWrapper.cs

@@ -23,7 +23,7 @@ namespace ICSharpCode.ILSpy
 {
 	class CommandWrapper : ICommand
 	{
-		private ICommand wrappedCommand;
+		private readonly ICommand wrappedCommand;
 
 		public CommandWrapper(ICommand wrappedCommand)
 		{

ILSpy/Controls/DockedPane.cs

@@ -65,7 +65,7 @@ namespace ICSharpCode.ILSpy.Controls
 		
 		public event EventHandler CloseButtonClicked;
 		
-		protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
+		protected override void OnKeyDown(KeyEventArgs e)
 		{
 			base.OnKeyDown(e);
 			if (e.Key == Key.F4 && e.KeyboardDevice.Modifiers == ModifierKeys.Control || e.Key == Key.Escape) {
@@ -79,7 +79,7 @@ namespace ICSharpCode.ILSpy.Controls
 	[MarkupExtensionReturnType(typeof(Color))]
 	class ControlColor : MarkupExtension
 	{
-		float val;
+		readonly float val;
 		
 		/// <summary>
 		/// Amount of highlight (0..1)

ILSpy/Controls/SortableGridViewColumn.cs

@@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.Controls
 			set {
 				if (sortBy != value) {
 					sortBy = value;
-					OnPropertyChanged(new System.ComponentModel.PropertyChangedEventArgs("SortBy"));
+					OnPropertyChanged(new PropertyChangedEventArgs("SortBy"));
 				}
 			}
 		}

ILSpy/DecompilationOptions.cs

@@ -59,7 +59,7 @@ namespace ICSharpCode.ILSpy
 		/// <remarks>
 		/// This state is used to restore test view's state when decompilation is started by Go Back/Forward action.
 		/// </remarks>
-		public ICSharpCode.ILSpy.TextView.DecompilerTextViewState TextViewState { get; set; }
+		public TextView.DecompilerTextViewState TextViewState { get; set; }
 
 		public DecompilationOptions()
 		{

ILSpy/Images/Images.cs

@@ -115,8 +115,8 @@ namespace ICSharpCode.ILSpy
 		}
 
 
-		private static TypeIconCache typeIconCache = new TypeIconCache();
-		private static MemberIconCache memberIconCache = new MemberIconCache();
+		private static readonly TypeIconCache typeIconCache = new TypeIconCache();
+		private static readonly MemberIconCache memberIconCache = new MemberIconCache();
 
 		public static ImageSource GetIcon(TypeIcon icon, AccessOverlayIcon overlay, bool isStatic = false)
 		{
@@ -246,7 +246,7 @@ namespace ICSharpCode.ILSpy
 
 		private abstract class IconCache<T>
 		{
-			private Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource> cache = new Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource>();
+			private readonly Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource> cache = new Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource>();
 
 			protected void PreloadPublicIconToCache(T icon, ImageSource image)
 			{

ILSpy/Languages/CSharpLanguage.cs

@@ -25,7 +25,6 @@ using System.Linq;
 using System.Resources;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using System.Xaml;
 using System.Xml;
 
 using ICSharpCode.Decompiler;
@@ -451,8 +450,8 @@ namespace ICSharpCode.ILSpy
 		#region WriteResourceFilesInProject
 		IEnumerable<Tuple<string, string>> WriteResourceFilesInProject(LoadedAssembly assembly, DecompilationOptions options, HashSet<string> directories)
 		{
-			AppDomain bamlDecompilerAppDomain = null;
-			try {
+			//AppDomain bamlDecompilerAppDomain = null;
+			//try {
 				foreach (EmbeddedResource r in assembly.AssemblyDefinition.MainModule.Resources.OfType<EmbeddedResource>()) {
 					string fileName;
 					Stream s = r.GetResourceStream();
@@ -503,11 +502,11 @@ namespace ICSharpCode.ILSpy
 					}
 					yield return Tuple.Create("EmbeddedResource", fileName);
 				}
-			}
-			finally {
-				if (bamlDecompilerAppDomain != null)
-					AppDomain.Unload(bamlDecompilerAppDomain);
-			}
+			//}
+			//finally {
+			//    if (bamlDecompilerAppDomain != null)
+			//        AppDomain.Unload(bamlDecompilerAppDomain);
+			//}
 		}
 
 		string GetFileNameForResource(string fullName, HashSet<string> directories)
@@ -621,7 +620,7 @@ namespace ICSharpCode.ILSpy
 			if (showAllMembers || !DecompilerSettingsPanel.CurrentDecompilerSettings.AnonymousMethods)
 				return member;
 			else
-				return ICSharpCode.ILSpy.TreeNodes.Analyzer.Helpers.GetOriginalCodeLocation(member);
+				return TreeNodes.Analyzer.Helpers.GetOriginalCodeLocation(member);
 		}
 
 		public override string GetTooltip(MemberReference member)

ILSpy/Languages/ILAstLanguage.cs

@@ -18,13 +18,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Disassembler;
 using ICSharpCode.Decompiler.ILAst;
-using ICSharpCode.NRefactory.CSharp;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy
@@ -97,7 +95,7 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
-		public override string TypeToString(TypeReference t, bool includeNamespace, ICustomAttributeProvider attributeProvider)
+		public override string TypeToString(TypeReference t, bool includeNamespace, ICustomAttributeProvider attributeProvider = null)
 		{
 			PlainTextOutput output = new PlainTextOutput();
 			t.WriteTo(output, includeNamespace ? ILNameSyntax.TypeName : ILNameSyntax.ShortTypeName);

ILSpy/Languages/ILLanguage.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy
 	/// </remarks>
 	public class ILLanguage : Language
 	{
-		bool detectControlStructure;
+		private readonly bool detectControlStructure;
 		
 		public ILLanguage(bool detectControlStructure)
 		{
@@ -125,7 +125,7 @@ namespace ICSharpCode.ILSpy
 			}
 		}
 		
-		public override string TypeToString(TypeReference t, bool includeNamespace, ICustomAttributeProvider attributeProvider)
+		public override string TypeToString(TypeReference t, bool includeNamespace, ICustomAttributeProvider attributeProvider = null)
 		{
 			PlainTextOutput output = new PlainTextOutput();
 			t.WriteTo(output, includeNamespace ? ILNameSyntax.TypeName : ILNameSyntax.ShortTypeName);

ILSpy/LoadedAssembly.cs

@@ -17,9 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Concurrent;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 using ICSharpCode.ILSpy.Options;
@@ -35,7 +33,7 @@ namespace ICSharpCode.ILSpy
 		readonly Task<AssemblyDefinition> assemblyTask;
 		readonly AssemblyList assemblyList;
 		readonly string fileName;
-		string shortName;
+		readonly string shortName;
 		
 		public LoadedAssembly(AssemblyList assemblyList, string fileName)
 		{

ILSpy/MainWindow.xaml.cs

@@ -47,7 +47,7 @@ namespace ICSharpCode.ILSpy
 	/// </summary>
 	partial class MainWindow : Window
 	{
-		NavigationHistory<NavigationState> history = new NavigationHistory<NavigationState>();
+		readonly NavigationHistory<NavigationState> history = new NavigationHistory<NavigationState>();
 		ILSpySettings spySettings;
 		internal SessionSettings sessionSettings;
 
@@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy
 		protected override void OnSourceInitialized(EventArgs e)
 		{
 			base.OnSourceInitialized(e);
-			HwndSource source = PresentationSource.FromVisual(this) as HwndSource;;
+			HwndSource source = PresentationSource.FromVisual(this) as HwndSource;
 			if (source != null) {
 				source.AddHook(WndProc);
 			}
@@ -362,7 +362,7 @@ namespace ICSharpCode.ILSpy
 			
 			assemblyListTreeNode = new AssemblyListTreeNode(assemblyList);
 			assemblyListTreeNode.FilterSettings = sessionSettings.FilterSettings.Clone();
-			assemblyListTreeNode.Select = node => SelectNode(node);
+			assemblyListTreeNode.Select = SelectNode;
 			treeView.Root = assemblyListTreeNode;
 			
 			if (assemblyList.ListName == AssemblyListManager.DefaultListName)

ILSpy/NavigationState.cs

@@ -18,8 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.TreeView;
 
@@ -27,7 +25,7 @@ namespace ICSharpCode.ILSpy
 {
 	public class NavigationState : IEquatable<NavigationState>
 	{
-		private HashSet<SharpTreeNode> treeNodes;
+		private readonly HashSet<SharpTreeNode> treeNodes;
 
 		public IEnumerable<SharpTreeNode> TreeNodes { get { return treeNodes; } }
 		public DecompilerTextViewState ViewState { get; private set; }

ILSpy/OpenListDialog.xaml.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy
 		public const string DotNet35List = ".NET 3.5";
 		public const string ASPDotNetMVC3List = "ASP.NET (MVC3)";
 
-		AssemblyListManager manager;
+		readonly AssemblyListManager manager;
 
 		public OpenListDialog()
 		{

ILSpy/TextView/CaretHighlightAdorner.cs

@@ -33,8 +33,8 @@ namespace ICSharpCode.ILSpy.TextView
 	/// </summary>
 	sealed class CaretHighlightAdorner : Adorner
 	{
-		Pen pen;
-		RectangleGeometry geometry;
+		readonly Pen pen;
+		readonly RectangleGeometry geometry;
 		
 		public CaretHighlightAdorner(TextArea textArea)
 			: base(textArea.TextView)

ILSpy/TextView/ReferenceElementGenerator.cs

@@ -28,8 +28,8 @@ namespace ICSharpCode.ILSpy.TextView
 	/// </summary>
 	sealed class ReferenceElementGenerator : VisualLineElementGenerator
 	{
-		Action<ReferenceSegment> referenceClicked;
-		Predicate<ReferenceSegment> isLink;
+		readonly Action<ReferenceSegment> referenceClicked;
+		readonly Predicate<ReferenceSegment> isLink;
 		
 		/// <summary>
 		/// The collection of references (hyperlinks).
@@ -84,8 +84,8 @@ namespace ICSharpCode.ILSpy.TextView
 	/// </summary>
 	sealed class VisualLineReferenceText : VisualLineText
 	{
-		ReferenceElementGenerator parent;
-		ReferenceSegment referenceSegment;
+		readonly ReferenceElementGenerator parent;
+		readonly ReferenceSegment referenceSegment;
 		
 		/// <summary>
 		/// Creates a visual line text element with the specified length.

ILSpy/TreeNodes/Analyzer/AnalyzeContextMenuEntry.cs

@@ -37,8 +37,8 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				if (!(node.Member is TypeDefinition
 				      || node.Member is FieldDefinition
 				      || node.Member is MethodDefinition
-				      || Analyzer.AnalyzedPropertyTreeNode.CanShow(node.Member)
-				      || Analyzer.AnalyzedEventTreeNode.CanShow(node.Member)))
+				      || AnalyzedPropertyTreeNode.CanShow(node.Member)
+				      || AnalyzedEventTreeNode.CanShow(node.Member)))
 					return false;
 			}
 
@@ -65,10 +65,10 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			MethodDefinition method = member as MethodDefinition;
 			if (method != null)
 				AnalyzerTreeView.Instance.Show(new AnalyzedMethodTreeNode(method));
-			var propertyAnalyzer = Analyzer.AnalyzedPropertyTreeNode.TryCreateAnalyzer(member);
+			var propertyAnalyzer = AnalyzedPropertyTreeNode.TryCreateAnalyzer(member);
 			if (propertyAnalyzer != null)
 				AnalyzerTreeView.Instance.Show(propertyAnalyzer);
-			var eventAnalyzer = Analyzer.AnalyzedEventTreeNode.TryCreateAnalyzer(member);
+			var eventAnalyzer = AnalyzedEventTreeNode.TryCreateAnalyzer(member);
 			if (eventAnalyzer != null)
 				AnalyzerTreeView.Instance.Show(eventAnalyzer);
 		}

ILSpy/TreeNodes/Analyzer/AnalyzedEventAccessorTreeNode.cs

@@ -23,7 +23,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
 	internal class AnalyzedEventAccessorTreeNode : AnalyzedMethodTreeNode
 	{
-		private string name;
+		private readonly string name;
 
 		public AnalyzedEventAccessorTreeNode(MethodDefinition analyzedMethod, string name)
 			: base(analyzedMethod)

ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs

@@ -21,8 +21,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -47,16 +45,11 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedEvent, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)
 		{
-			string name = analyzedEvent.Name;
-			string declTypeName = analyzedEvent.DeclaringType.FullName;
-
 			if (!TypesHierarchyHelpers.IsBaseType(analyzedEvent.DeclaringType, type, resolveTypeArguments: false))
 				yield break;
 

ILSpy/TreeNodes/Analyzer/AnalyzedFieldAccessTreeNode.cs

@@ -17,13 +17,12 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using System.Collections;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
@@ -63,7 +62,6 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			string name = analyzedField.Name;
-			string declTypeName = analyzedField.DeclaringType.FullName;
 
 			foreach (MethodDefinition method in type.Methods) {
 				bool found = false;

ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs

@@ -21,7 +21,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -46,9 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedMethod, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs

@@ -21,7 +21,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -48,9 +47,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedMethod, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs

@@ -19,12 +19,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -52,9 +49,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedMethod, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs

@@ -20,10 +20,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.NRefactory.Utils;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -48,16 +45,11 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedProperty, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)
 		{
-			string name = analyzedProperty.Name;
-			string declTypeName = analyzedProperty.DeclaringType.FullName;
-
 			if (!TypesHierarchyHelpers.IsBaseType(analyzedProperty.DeclaringType, type, resolveTypeArguments: false))
 				yield break;
 

ILSpy/TreeNodes/Analyzer/AnalyzedTypeExposedByTreeNode.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -45,9 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedType, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedTypeExtensionMethodsTreeNode.cs

@@ -20,7 +20,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -45,9 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedType, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs

@@ -21,7 +21,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using ICSharpCode.Decompiler.Ast;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
@@ -50,9 +49,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override IEnumerable<AnalyzerTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedAnalyzer<AnalyzerTreeNode>(analyzedType, FindReferencesInType);
-			foreach (var child in analyzer.PerformAnalysis(ct).OrderBy(n => n.Text)) {
-				yield return child;
-			}
+			return analyzer.PerformAnalysis(ct).OrderBy(n => n.Text);
 		}
 
 		private IEnumerable<AnalyzerTreeNode> FindReferencesInType(TypeDefinition type)

ILSpy/TreeNodes/Analyzer/AnalyzedVirtualMethodUsedByTreeNode.cs

@@ -21,7 +21,6 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using ICSharpCode.Decompiler.Ast;
@@ -64,9 +63,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		{
 			foundMethods = new ConcurrentDictionary<MethodDefinition, int>();
 
-			var BaseMethods = TypesHierarchyHelpers.FindBaseMethods(analyzedMethod).ToArray();
-			if (BaseMethods.Length > 0) {
-				baseMethod = BaseMethods[BaseMethods.Length - 1];
+			var baseMethods = TypesHierarchyHelpers.FindBaseMethods(analyzedMethod).ToArray();
+			if (baseMethods.Length > 0) {
+				baseMethod = baseMethods[baseMethods.Length - 1];
 			} else
 				baseMethod = analyzedMethod;
 

ILSpy/TreeNodes/Analyzer/Helpers.cs

@@ -17,12 +17,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using ICSharpCode.Decompiler;
 using Mono.Cecil;
-using ICSharpCode.Decompiler.ILAst;
 using Mono.Cecil.Cil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
@@ -82,11 +79,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		private static MethodDefinition GetTypeConstructor(TypeDefinition type)
 		{
-			foreach (MethodDefinition method in type.Methods) {
-				if (method.Name == ".ctor")
-					return method;
-			}
-			return null;
+			return type.Methods.FirstOrDefault(method => method.Name == ".ctor");
 		}
 
 		private static MethodDefinition FindMethodUsageInType(TypeDefinition type, MethodDefinition analyzedMethod)
@@ -99,7 +92,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				foreach (Instruction instr in method.Body.Instructions) {
 					MethodReference mr = instr.Operand as MethodReference;
 					if (mr != null && mr.Name == name &&
-						Helpers.IsReferencedBy(analyzedMethod.DeclaringType, mr.DeclaringType) &&
+						IsReferencedBy(analyzedMethod.DeclaringType, mr.DeclaringType) &&
 						mr.Resolve() == analyzedMethod) {
 						found = true;
 						break;

ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs

@@ -30,12 +30,12 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 	/// </summary>
 	internal class ScopedWhereUsedAnalyzer<T>
 	{
-		private AssemblyDefinition assemblyScope;
+		private readonly AssemblyDefinition assemblyScope;
 		private TypeDefinition typeScope;
 
-		private Accessibility memberAccessibility = Accessibility.Public;
+		private readonly Accessibility memberAccessibility = Accessibility.Public;
 		private Accessibility typeAccessibility = Accessibility.Public;
-		private Func<TypeDefinition, IEnumerable<T>> typeAnalysisFunction;
+		private readonly Func<TypeDefinition, IEnumerable<T>> typeAnalysisFunction;
 
 		public ScopedWhereUsedAnalyzer(TypeDefinition type, Func<TypeDefinition, IEnumerable<T>> typeAnalysisFunction)
 		{
@@ -204,7 +204,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			var assemblies = GetAssemblyAndAnyFriends(assemblyScope, ct);
 
 			// use parallelism only on the assembly level (avoid locks within Cecil)
-			return assemblies.AsParallel().WithCancellation(ct).SelectMany((AssemblyDefinition a) => FindReferencesInAssembly(a, ct));
+			return assemblies.AsParallel().WithCancellation(ct).SelectMany(a => FindReferencesInAssembly(a, ct));
 		}
 
 		private IEnumerable<T> FindReferencesGlobal(CancellationToken ct)
@@ -212,7 +212,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			var assemblies = GetReferencingAssemblies(assemblyScope, ct);
 
 			// use parallelism only on the assembly level (avoid locks within Cecil)
-			return assemblies.AsParallel().WithCancellation(ct).SelectMany((AssemblyDefinition asm) => FindReferencesInAssembly(asm, ct));
+			return assemblies.AsParallel().WithCancellation(ct).SelectMany(asm => FindReferencesInAssembly(asm, ct));
 		}
 
 		private IEnumerable<T> FindReferencesInAssembly(AssemblyDefinition asm, CancellationToken ct)

ILSpy/TreeNodes/AssemblyListTreeNode.cs

@@ -203,8 +203,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 					p.EnsureLazyChildren();
 					methodNode = p.Children.OfType<MethodTreeNode>().FirstOrDefault(m => m.MethodDefinition == def);
 					if (methodNode != null) {
-						/// If the requested method is a property or event accessor, and accessors are
-						/// hidden in the UI, then return the owning property or event.
+						// If the requested method is a property or event accessor, and accessors are
+						// hidden in the UI, then return the owning property or event.
 						if (methodNode.IsHidden)
 							return p;
 						else

ILSpy/TreeNodes/AssemblyTreeNode.cs

@@ -18,14 +18,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Threading;
 using ICSharpCode.Decompiler;
 using ICSharpCode.ILSpy.TextView;
 using ICSharpCode.TreeView;
@@ -102,7 +98,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 		}
 
-		Dictionary<TypeDefinition, TypeTreeNode> typeDict = new Dictionary<TypeDefinition, TypeTreeNode>();
+		readonly Dictionary<TypeDefinition, TypeTreeNode> typeDict = new Dictionary<TypeDefinition, TypeTreeNode>();
 
 		protected override void LoadChildren()
 		{

ILSpy/TreeNodes/BaseTypesEntryNode.cs

@@ -26,9 +26,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
 {
 	sealed class BaseTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
 	{
-		private TypeReference tr;
+		private readonly TypeReference tr;
 		private TypeDefinition def;
-		private bool isInterface;
+		private readonly bool isInterface;
 
 		public BaseTypesEntryNode(TypeReference tr, bool isInterface)
 		{

ILSpy/TreeNodes/DerivedTypesEntryNode.cs

@@ -26,9 +26,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
 {
 	class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
 	{
-		private TypeDefinition type;
-		private AssemblyDefinition[] assemblies;
-		private ThreadingSupport threading;
+		private readonly TypeDefinition type;
+		private readonly AssemblyDefinition[] assemblies;
+		private readonly ThreadingSupport threading;
 
 		public DerivedTypesEntryNode(TypeDefinition type, AssemblyDefinition[] assemblies)
 		{

ILSpy/TreeNodes/DerivedTypesTreeNode.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	{
 		readonly AssemblyList list;
 		readonly TypeDefinition type;
-		ThreadingSupport threading;
+		readonly ThreadingSupport threading;
 
 		public DerivedTypesTreeNode(AssemblyList list, TypeDefinition type)
 		{

ILSpy/TreeNodes/FieldTreeNode.cs

@@ -68,7 +68,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				return Images.GetIcon(MemberIcon.Field, GetOverlayIcon(field.Attributes), field.IsStatic);
 		}
 
-		private static bool IsDecimalConstant(Mono.Cecil.FieldDefinition field)
+		private static bool IsDecimalConstant(FieldDefinition field)
 		{
 			var fieldType = field.FieldType;
 			if (fieldType.Name == "Decimal" && fieldType.Namespace == "System") {

ILSpy/TreeNodes/ILSpyTreeNode.cs

@@ -129,7 +129,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 		}
 
-		FilterSettings StripSearchTerm(FilterSettings filterSettings)
+		static FilterSettings StripSearchTerm(FilterSettings filterSettings)
 		{
 			if (filterSettings == null)
 				return null;

ILSpy/TreeNodes/MethodTreeNode.cs

@@ -30,7 +30,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	public sealed class MethodTreeNode : ILSpyTreeNode, IMemberTreeNode
 	{
-		MethodDefinition method;
+		readonly MethodDefinition method;
 
 		public MethodDefinition MethodDefinition
 		{

ILSpy/TreeNodes/ModuleReferenceTreeNode.cs

@@ -18,7 +18,6 @@
 
 using System;
 using ICSharpCode.Decompiler;
-using ICSharpCode.TreeView;
 using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
@@ -28,7 +27,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	sealed class ModuleReferenceTreeNode : ILSpyTreeNode
 	{
-		ModuleReference r;
+		readonly ModuleReference r;
 		
 		public ModuleReferenceTreeNode(ModuleReference r)
 		{

ILSpy/TreeNodes/NamespaceTreeNode.cs

@@ -27,7 +27,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	public sealed class NamespaceTreeNode : ILSpyTreeNode
 	{
-		string name;
+		readonly string name;
 		
 		public string Name {
 			get { return name; }

ILSpy/TreeNodes/ResourceNodes/CursorResourceEntryNode.cs

@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	{
 		static readonly string[] imageFileExtensions = { ".cur" };
 
-		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
+		public ILSpyTreeNode CreateNode(Resource resource)
 		{
 			EmbeddedResource er = resource as EmbeddedResource;
 			if (er != null) {
@@ -93,7 +93,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				output.AddButton(Images.Save, "Save", delegate {
 					Save(null);
 				});
-				textView.ShowNode(output, this, null);
+				textView.ShowNode(output, this);
 				return true;
 			}
 			catch (Exception) {

ILSpy/TreeNodes/ResourceNodes/ImageResourceEntryNode.cs

@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	{
 		static readonly string[] imageFileExtensions = { ".png", ".gif", ".bmp", ".jpg", ".ico" };
 
-		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
+		public ILSpyTreeNode CreateNode(Resource resource)
 		{
 			EmbeddedResource er = resource as EmbeddedResource;
 			if (er != null) {
@@ -90,7 +90,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				output.AddButton(Images.Save, "Save", delegate {
 					Save(null);
 				});
-				textView.ShowNode(output, this, null);
+				textView.ShowNode(output, this);
 				return true;
 			}
 			catch (Exception) {

ILSpy/TreeNodes/ResourceNodes/ResourceEntryNode.cs

@@ -17,14 +17,10 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.ComponentModel.Composition;
 using System.IO;
-using System.Windows.Controls;
-using System.Windows.Media.Imaging;
 using ICSharpCode.Decompiler;
 using ICSharpCode.ILSpy.TextView;
 using Microsoft.Win32;
-using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
@@ -38,7 +34,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 		public override object Text
 		{
-			get { return key.ToString(); }
+			get { return this.key; }
 		}
 
 		public override object Icon

ILSpy/TreeNodes/ResourceNodes/ResourceTreeNode.cs

@@ -17,14 +17,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections;
-using System.ComponentModel.Composition;
 using System.IO;
-using System.Linq;
-using System.Resources;
 using System.Text;
-using System.Windows;
-using System.Windows.Threading;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Utils;
 using ICSharpCode.Decompiler;
@@ -40,7 +34,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	public class ResourceTreeNode : ILSpyTreeNode
 	{
-		Resource r;
+		readonly Resource r;
 		
 		public ResourceTreeNode(Resource r)
 		{
@@ -107,7 +101,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return false;
 		}
 		
-		public override bool Save(TextView.DecompilerTextView textView)
+		public override bool Save(DecompilerTextView textView)
 		{
 			EmbeddedResource er = r as EmbeddedResource;
 			if (er != null) {

ILSpy/TreeNodes/ResourceNodes/ResourcesFileTreeNode.cs

@@ -51,8 +51,8 @@ namespace ICSharpCode.ILSpy.TreeNodes
 
 	sealed class ResourcesFileTreeNode : ResourceTreeNode
 	{
-		ICollection<KeyValuePair<string, string>> stringTableEntries = new ObservableCollection<KeyValuePair<string, string>>();
-		ICollection<KeyValuePair<string, string>> otherEntries = new ObservableCollection<KeyValuePair<string, string>>();
+		readonly ICollection<KeyValuePair<string, string>> stringTableEntries = new ObservableCollection<KeyValuePair<string, string>>();
+		readonly ICollection<KeyValuePair<string, string>> otherEntries = new ObservableCollection<KeyValuePair<string, string>>();
 
 		public ResourcesFileTreeNode(EmbeddedResource er)
 			: base(er)

ILSpy/TreeNodes/ResourceNodes/XmlResourceNode.cs

@@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy.Xaml
 	{
 		private readonly static string[] xmlFileExtensions = { ".xml", ".xsd", ".xslt" };
 
-		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
+		public ILSpyTreeNode CreateNode(Resource resource)
 		{
 			EmbeddedResource er = resource as EmbeddedResource;
 			if (er != null)

ILSpy/TreeNodes/ThreadingSupport.cs

@@ -123,14 +123,14 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				return FilterResult.Match;
 			}
 			
-			public override void Decompile(Language language, ICSharpCode.Decompiler.ITextOutput output, DecompilationOptions options)
+			public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 			{
 			}
 		}
 		
 		sealed class ErrorTreeNode : ILSpyTreeNode
 		{
-			string text;
+			readonly string text;
 			
 			public override object Text {
 				get { return text; }
@@ -146,7 +146,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				return FilterResult.Match;
 			}
 			
-			public override void Decompile(Language language, ICSharpCode.Decompiler.ITextOutput output, DecompilationOptions options)
+			public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 			{
 			}
 		}

ILSpy/VB/ILSpyEnvironmentProvider.cs

@@ -35,10 +35,10 @@ namespace ICSharpCode.ILSpy.VB
 				return "";
 			}
 		}
-		
-		ITypeResolveContext context;
-		
-		CecilLoader loader = new CecilLoader(false);
+
+		readonly ITypeResolveContext context;
+
+		readonly CecilLoader loader = new CecilLoader(false);
 		
 		public ILSpyEnvironmentProvider(ITypeResolveContext context)
 		{
@@ -111,7 +111,6 @@ namespace ICSharpCode.ILSpy.VB
 				case "System.String":
 					return TypeCode.String;
 				default:
-					
 					break;
 			}
 			

ILSpy/VB/VBLanguage.cs

@@ -23,7 +23,6 @@ using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;
 using System.Resources;
-using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 
@@ -45,7 +44,7 @@ namespace ICSharpCode.ILSpy.VB
 	[Export(typeof(Language))]
 	public class VBLanguage : Language
 	{
-		Predicate<IAstTransform> transformAbortCondition = null;
+		readonly Predicate<IAstTransform> transformAbortCondition = null;
 		bool showAllMembers = false;
 		
 		public VBLanguage()
@@ -313,8 +312,8 @@ namespace ICSharpCode.ILSpy.VB
 		#region WriteResourceFilesInProject
 		IEnumerable<Tuple<string, string>> WriteResourceFilesInProject(LoadedAssembly assembly, DecompilationOptions options, HashSet<string> directories)
 		{
-			AppDomain bamlDecompilerAppDomain = null;
-			try {
+			//AppDomain bamlDecompilerAppDomain = null;
+			//try {
 				foreach (EmbeddedResource r in assembly.AssemblyDefinition.MainModule.Resources.OfType<EmbeddedResource>()) {
 					string fileName;
 					Stream s = r.GetResourceStream();
@@ -365,11 +364,11 @@ namespace ICSharpCode.ILSpy.VB
 					}
 					yield return Tuple.Create("EmbeddedResource", fileName);
 				}
-			}
-			finally {
-				if (bamlDecompilerAppDomain != null)
-					AppDomain.Unload(bamlDecompilerAppDomain);
-			}
+			//}
+			//finally {
+			//    if (bamlDecompilerAppDomain != null)
+			//        AppDomain.Unload(bamlDecompilerAppDomain);
+			//}
 		}
 
 		string GetFileNameForResource(string fullName, HashSet<string> directories)

ILSpy/XmlDoc/XmlDocRenderer.cs

@@ -31,7 +31,7 @@ namespace ICSharpCode.ILSpy.XmlDoc
 	/// </summary>
 	public class XmlDocRenderer
 	{
-		StringBuilder ret = new StringBuilder();
+		readonly StringBuilder ret = new StringBuilder();
 		
 		public void AppendText(string text)
 		{