[CodeActions] Add convertAnonymousDelegateToLambdaAction.

ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj

@@ -429,6 +429,7 @@
     <Compile Include="Refactoring\CodeIssues\ThreadStaticOnInstanceFieldIssue.cs" />
     <Compile Include="Refactoring\CodeIssues\StaticFieldInGenericTypeIssue.cs" />
     <Compile Include="Parser\SeekableStreamReader.cs" />
+    <Compile Include="Refactoring\CodeActions\ConvertAnonymousDelegateToLambdaAction.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">

ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs

@@ -0,0 +1,61 @@
+//
+// ConvertAnonymousDelegateToExpression.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// 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.
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Convert anonymous delegate to lambda block",
+	               Description = "Converts an anonymous delegate into a lambda in block form.")]
+	public class ConvertAnonymousDelegateToLambdaAction : SpecializedCodeAction<AnonymousMethodExpression>
+	{
+		#region implemented abstract members of SpecializedCodeAction
+		protected override CodeAction GetAction(RefactoringContext context, AnonymousMethodExpression node)
+		{
+			if (context.Location < node.DelegateToken.StartLocation || context.Location >= node.Body.StartLocation)
+				return null;
+
+			if (!node.HasParameterList)
+				return null;
+
+			return new CodeAction(context.TranslateString("Convert to lambda block"), script => {
+				var parent = node.Parent;
+				while (!(parent is Statement))
+					parent = parent.Parent;
+				bool explicitLambda = parent is VariableDeclarationStatement && ((VariableDeclarationStatement)parent).Type.GetText() == "var";
+				var lambda = new LambdaExpression {	Body = node.Body.Clone() };
+				foreach (var parameter in node.Parameters) {
+					if (explicitLambda) {
+						lambda.Parameters.Add(new ParameterDeclaration { Type = parameter.Type.Clone(), Name = parameter.Name });
+					} else {
+						lambda.Parameters.Add(new ParameterDeclaration { Name = parameter.Name });
+					}
+				}
+				script.Replace(node, lambda);
+			});
+		}
+		#endregion
+	}
+}
+

ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs

@@ -0,0 +1,93 @@
+//
+// ConvertAnonymousDelegateToExpressionTests.cs
+//
+// Author:
+//       Simon Lindgren <simon.n.lindgren@gmail.com>
+//
+// Copyright (c) 2012 Simon Lindgren
+//
+// 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 NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertAnonymousDelegateToLambdaTests : ContextActionTestBase
+	{
+		[Test]
+		public void BasicTest ()
+		{
+			Test<ConvertAnonymousDelegateToLambdaAction>(@"
+class A
+{
+	void F ()
+	{
+		System.Action<int, int> action = delegate$ (int i1, int i2) { System.Console.WriteLine (i1); };
+	}
+}", @"
+class A
+{
+	void F ()
+	{
+		System.Action<int, int> action = (i1, i2) =>  {
+	System.Console.WriteLine (i1);
+};
+	}
+}");
+		}
+
+		[Test]
+		public void VarDeclaration ()
+		{
+			Test<ConvertAnonymousDelegateToLambdaAction>(@"
+class A
+{
+	void F ()
+	{
+		var action = delegate$ (int i1, int i2) { System.Console.WriteLine (i1); };
+	}
+}", @"
+class A
+{
+	void F ()
+	{
+		var action = (int i1, int i2) =>  {
+	System.Console.WriteLine (i1);
+};
+	}
+}");
+		}
+
+		[Test]
+		public void IgnoresParameterLessDelegates ()
+		{
+			TestWrongContext<ConvertAnonymousDelegateToLambdaAction>(@"
+class A
+{
+	void F ()
+	{
+		System.Action<int> = delegate$ { System.Console.WriteLine (i); };
+	}
+}");
+		}
+	}
+}
+

ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@@ -299,6 +299,7 @@
     <Compile Include="CSharp\CodeIssues\ExceptionRethrowTests.cs" />
     <Compile Include="CSharp\CodeIssues\ThreadStaticOnInstanceFieldTests.cs" />
     <Compile Include="CSharp\CodeIssues\StaticFieldInGenericTypeTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertAnonymousDelegateToLambdaTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">
@@ -331,7 +332,6 @@
     <Folder Include="CSharp\CodeIssues\ParameterCanBeDemotedIssue\" />
     <Folder Include="Utils\CompositeFormatStringParser\" />
     <Folder Include="CSharp\CodeIssues\FormatStringIssues\" />
-    <Folder Include="Editor" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>