diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
index 8aab618c4b..4032c95608 100644
--- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
@@ -430,6 +430,7 @@
+
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
new file mode 100644
index 0000000000..cb6a555f1e
--- /dev/null
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertLambdaToAnonymousDelegateAction.cs
@@ -0,0 +1,80 @@
+//
+// ConvertLambdaToDelegateAction.cs
+//
+// Author:
+// Simon Lindgren
+//
+// 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 ICSharpCode.NRefactory.CSharp.Resolver;
+using System.Collections.Generic;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+ [ContextAction("Convert lambda to anonymous delegate",
+ Description = "Converts a lambda to an anonymous delegate.")]
+ public class ConvertLambdaToAnonymousDelegateAction : SpecializedCodeAction
+ {
+ #region implemented abstract members of SpecializedCodeAction
+ protected override CodeAction GetAction(RefactoringContext context, LambdaExpression node)
+ {
+ if (context.Location < node.StartLocation || context.Location >= node.Body.StartLocation)
+ return null;
+
+ var lambdaResolveResult = context.Resolve(node) as LambdaResolveResult;
+ if (lambdaResolveResult == null)
+ return null;
+
+ return new CodeAction(context.TranslateString("Convert to anonymous delegate"), script => {
+ BlockStatement newBody;
+ if (node.Body is BlockStatement) {
+ newBody = (BlockStatement)node.Body.Clone();
+ } else {
+ newBody = new BlockStatement {
+ Statements = {
+ new ExpressionStatement((Expression)node.Body.Clone())
+ }
+ };
+ }
+ var method = new AnonymousMethodExpression (newBody, GetParameters(lambdaResolveResult.Parameters, context));
+ method.HasParameterList = true;
+ script.Replace(node, method);
+ });
+ }
+ #endregion
+
+ IEnumerable GetParameters(IList parameters, RefactoringContext context)
+ {
+ foreach (var parameter in parameters) {
+ var type = context.CreateShortType(parameter.Type);
+ var name = parameter.Name;
+ ParameterModifier modifier = ParameterModifier.None;
+ if (parameter.IsRef)
+ modifier |= ParameterModifier.Ref;
+ if (parameter.IsOut)
+ modifier |= ParameterModifier.Out;
+ yield return new ParameterDeclaration(type, name, modifier);
+ }
+ }
+ }
+}
+
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertLamdaToAnonymousDelegateTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertLamdaToAnonymousDelegateTests.cs
new file mode 100644
index 0000000000..b1fd140cdd
--- /dev/null
+++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertLamdaToAnonymousDelegateTests.cs
@@ -0,0 +1,79 @@
+//
+// ConvertLambdaToDelegateAction.cs
+//
+// Author:
+// Simon Lindgren
+//
+// 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 NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+ [TestFixture]
+ public class ConvertLamdaToAnonymousDelegateTests : ContextActionTestBase
+ {
+ [Test]
+ public void LambdaBlock ()
+ {
+ Test(@"
+class A
+{
+ void F ()
+ {
+ System.Action = (i1, i2)$ => { System.Console.WriteLine (i1); };
+ }
+}", @"
+class A
+{
+ void F ()
+ {
+ System.Action = delegate (int i1, int i2) {
+ System.Console.WriteLine (i1);
+};
+ }
+}");
+ }
+
+ [Test]
+ public void LambdaExpression ()
+ {
+ Test(@"
+class A
+{
+ void F ()
+ {
+ System.Action = (i1, i2)$ => System.Console.WriteLine (i1);
+ }
+}", @"
+class A
+{
+ void F ()
+ {
+ System.Action = delegate (int i1, int i2) {
+ System.Console.WriteLine (i1);
+};
+ }
+}");
+ }
+ }
+}
+
diff --git a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
index a49c88b48e..0cfb1ed995 100644
--- a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
+++ b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
@@ -300,6 +300,7 @@
+