Move DecompilerSettings from ICSharpCode.Decompiler.CSharp to ICSharpCode.Decompiler; Add Settings to ILTransformContext

ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs

@@ -625,7 +625,7 @@ namespace ICSharpCode.Decompiler.CSharp
 				}
 			}
 			
-			var context = new ILTransformContext { TypeSystem = specializingTypeSystem, CancellationToken = CancellationToken };
+			var context = new ILTransformContext { Settings = settings, TypeSystem = specializingTypeSystem, CancellationToken = CancellationToken };
 			foreach (var transform in ilTransforms) {
 				CancellationToken.ThrowIfCancellationRequested();
 				transform.Run(function, context);

ICSharpCode.Decompiler/DecompilerSettings.cs

@@ -20,7 +20,7 @@ using System;
 using System.ComponentModel;
 using ICSharpCode.NRefactory.CSharp;
 
-namespace ICSharpCode.Decompiler.CSharp
+namespace ICSharpCode.Decompiler
 {
 	/// <summary>
 	/// Settings for the decompiler.

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -64,7 +64,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CSharp\Annotations.cs" />
-    <Compile Include="CSharp\DecompilerSettings.cs" />
+    <Compile Include="DecompilerSettings.cs" />
     <Compile Include="CSharp\Transforms\ContextTrackingVisitor.cs" />
     <Compile Include="CSharp\Transforms\DecimalConstantTransform.cs" />
     <Compile Include="CSharp\Transforms\DeclareVariables.cs" />

ICSharpCode.Decompiler/IL/Transforms/DelegateConstruction.cs

@@ -31,7 +31,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 		
 		void IILTransform.Run(ILFunction function, ILTransformContext context)
 		{
-			if (!new DecompilerSettings().AnonymousMethods)
+			if (!context.Settings.AnonymousMethods)
 				return;
 			this.context = context;
 			this.decompilationContext = new SimpleTypeResolveContext(context.TypeSystem.Resolve(function.Method));
@@ -81,7 +81,6 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 		{
 			if (potentialDisplayClass == null || !potentialDisplayClass.IsCompilerGeneratedOrIsInCompilerGeneratedClass())
 				return false;
-			// check that methodContainingType is within containingType
 			while (potentialDisplayClass != decompiledTypeDefinition) {
 				potentialDisplayClass = potentialDisplayClass.DeclaringTypeDefinition;
 				if (potentialDisplayClass == null)
@@ -107,7 +106,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 				
 				function.RunTransforms(CSharpDecompiler.GetILTransforms(), context, t => t is DelegateConstruction);
 				function.AcceptVisitor(new ReplaceDelegateTargetVisitor(target, function.Variables.SingleOrDefault(v => v.Index == -1 && v.Kind == VariableKind.Parameter)));
-				((IILTransform)this).Run(function, new ILTransformContext { CancellationToken = context.CancellationToken, TypeSystem = localTypeSystem });
+				// handle nested lambdas
+				((IILTransform)new DelegateConstruction()).Run(function, new ILTransformContext { Settings = context.Settings, CancellationToken = context.CancellationToken, TypeSystem = localTypeSystem });
 				return function;
 			}
 			return null;

ICSharpCode.Decompiler/IL/Transforms/IILTransform.cs

@@ -24,6 +24,7 @@ namespace ICSharpCode.Decompiler.IL
 	public class ILTransformContext
 	{
 		public IDecompilerTypeSystem TypeSystem { get; set; }
+		public DecompilerSettings Settings { get; set; }
 		public CancellationToken CancellationToken { get; set; }
 	}
 

ILSpy/Languages/ILAstLanguage.cs

@@ -154,7 +154,7 @@ namespace ICSharpCode.ILSpy
 				var typeSystem = new DecompilerTypeSystem(method.Module);
 				ILReader reader = new ILReader(typeSystem);
 				ILFunction il = reader.ReadIL(method.Body, options.CancellationToken);
-				il.RunTransforms(transforms, new ILTransformContext { TypeSystem = typeSystem });
+				il.RunTransforms(transforms, new ILTransformContext { Settings = options.DecompilerSettings, TypeSystem = typeSystem });
 				il.WriteTo(output);
 			}
 		}