[CodeAction] Added ConvertLambdaBodyExpressionToStatementAction and ConvertLambdaBodyStatementToExpressionAction

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

@@ -246,6 +246,8 @@
     <Compile Include="Refactoring\CodeActions\ConvertExplicitToImplicitImplementationAction.cs" />
     <Compile Include="Refactoring\CodeActions\ConvertIfToSwitchAction.cs" />
     <Compile Include="Refactoring\CodeActions\ConvertImplicitToExplicitImplementationAction.cs" />
+    <Compile Include="Refactoring\CodeActions\ConvertLambdaBodyExpressionToStatementAction.cs" />
+    <Compile Include="Refactoring\CodeActions\ConvertLambdaBodyStatementToExpressionAction.cs" />
     <Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" />
     <Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" />
     <Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" />

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

@@ -0,0 +1,80 @@
+// 
+// ConvertLambdaBodyExpressionToStatementAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// 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.Linq;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Converts expression of lambda body to statement",
+					Description = "Converts expression of lambda body to statement")]
+	public class ConvertLambdaBodyExpressionToStatementAction : SpecializedCodeAction<LambdaExpression>
+	{
+
+		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
+		{
+			if (!node.ArrowToken.Contains (context.Location))
+				return null;
+
+			var bodyExpr = node.Body as Expression;
+			if (bodyExpr == null)
+				return null;
+			return new CodeAction (context.TranslateString ("Convert to lambda statement"),
+				script =>
+				{
+					var body = new BlockStatement ();
+					if (RequireReturnStatement (context, node)) {
+						body.Add (new ReturnStatement (bodyExpr.Clone ()));
+					} else {
+						body.Add (new ExpressionStatement (bodyExpr.Clone ()));
+					}
+					script.Replace (bodyExpr, body);
+				});
+		}
+
+		static bool RequireReturnStatement (RefactoringContext context, LambdaExpression lambda)
+		{
+			var parent = lambda.Parent;
+			while (parent is ParenthesizedExpression)
+				parent = parent.Parent;
+
+			ITypeDefinition delegateTypeDef;
+			if (parent is InvocationExpression) {
+				var invocation = (InvocationExpression)parent;
+				var argIndex = invocation.Arguments.TakeWhile (arg => !arg.Contains (lambda.StartLocation)).Count ();
+				var resolveResult = (CSharpInvocationResolveResult)context.Resolve (invocation);
+				delegateTypeDef = resolveResult.Arguments [argIndex].Type.GetDefinition ();
+			} else {
+				delegateTypeDef = context.Resolve (parent).Type.GetDefinition ();
+			}
+			if (delegateTypeDef == null)
+				return false;
+			var invokeMethod = delegateTypeDef.GetMethods (m => m.Name == "Invoke").FirstOrDefault ();
+			return invokeMethod != null && invokeMethod.ReturnType.ReflectionName != "System.Void";
+		}
+	}
+}

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

@@ -0,0 +1,57 @@
+// 
+// ConvertLambdaBodyStatementToExpressionAction.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// 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 ("Converts statement of lambda body to expression",
+					Description = "Converts statement of lambda body to expression")]
+	public class ConvertLambdaBodyStatementToExpressionAction : SpecializedCodeAction<LambdaExpression>
+	{
+		protected override CodeAction GetAction (RefactoringContext context, LambdaExpression node)
+		{
+			if (!node.ArrowToken.Contains (context.Location))
+				return null;
+
+			var blockStatement = node.Body as BlockStatement;
+			if (blockStatement == null || blockStatement.Statements.Count > 1)
+				return null;
+
+			Expression expr;
+			var returnStatement = blockStatement.Statements.FirstOrNullObject () as ReturnStatement;
+			if (returnStatement != null) {
+				expr = returnStatement.Expression;
+			} else {
+				var exprStatement = blockStatement.Statements.FirstOrNullObject () as ExpressionStatement;
+				if (exprStatement == null)
+					return null;
+				expr = exprStatement.Expression;
+			}
+			
+			return new CodeAction (context.TranslateString ("Convert to lambda expression"),
+				script => script.Replace (blockStatement, expr.Clone ()));
+		}
+	}
+}

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

@@ -0,0 +1,161 @@
+// 
+// ConvertLambdaBodyExpressionToStatementTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// 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 ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertLambdaBodyExpressionToStatementTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestReturn ()
+		{
+			Test<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i $=> i + 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i => {
+			return i + 1;
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestExprStatement()
+		{
+			Test<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i $=> i++;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i => {
+			i++;
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestWrongContext ()
+		{
+			TestWrongContext<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i $=> {
+			return i + 1;
+		};
+	}
+}");
+		}
+
+		[Test]
+		public void TestParenthesis ()
+		{
+			Test<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f;
+		f = (i $=> i + 1);
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f;
+		f = (i => {
+			return i + 1;
+		});
+	}
+}");
+		}
+
+		[Test]
+		public void TestInvocation ()
+		{
+			Test<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void Test (int k, System.Func<int, int> f) { }
+	void TestMethod ()
+	{
+		Test (1, i $=> i + 1);
+	}
+}", @"
+class TestClass
+{
+	void Test (int k, System.Func<int, int> f) { }
+	void TestMethod ()
+	{
+		Test (1, i => {
+			return i + 1;
+		});
+	}
+}");
+			Test<ConvertLambdaBodyExpressionToStatementAction> (@"
+class TestClass
+{
+	void Test2 (System.Action<int> a) { }
+	void TestMethod ()
+	{
+		Test2 (i $=> i++);
+	}
+}", @"
+class TestClass
+{
+	void Test2 (System.Action<int> a) { }
+	void TestMethod ()
+	{
+		Test2 (i => {
+			i++;
+		});
+	}
+}");
+		}
+	}
+}

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

@@ -0,0 +1,79 @@
+// 
+// ConvertLambdaBodyStatementToExpressionTests.cs
+// 
+// Author:
+//      Mansheng Yang <lightyang0@gmail.com>
+// 
+// Copyright (c) 2012 Mansheng Yang <lightyang0@gmail.com>
+// 
+// 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 ICSharpCode.NRefactory.CSharp.Refactoring;
+using NUnit.Framework;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class ConvertLambdaBodyStatementToExpressionTests : ContextActionTestBase
+	{
+		[Test]
+		public void TestReturn ()
+		{
+			Test<ConvertLambdaBodyStatementToExpressionAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i $=> {
+			return i + 1;
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Func<int, int> f = i => i + 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestExpressionStatement ()
+		{
+			Test<ConvertLambdaBodyStatementToExpressionAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i $=> {
+			System.Console.Write (i);
+		};
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		System.Action<int> f = i => System.Console.Write (i);
+	}
+}");
+		}
+	}
+}

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

@@ -86,6 +86,8 @@
     <Compile Include="CSharp\CodeActions\ConvertExplicitToImplicitImplementationTests.cs" />
     <Compile Include="CSharp\CodeActions\ConvertIfToSwtichTests.cs" />
     <Compile Include="CSharp\CodeActions\ConvertImplicitToExplicittImplementationTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyExpressionToStatementTests.cs" />
+    <Compile Include="CSharp\CodeActions\ConvertLambdaBodyStatementToExpressionTests.cs" />
     <Compile Include="CSharp\CodeActions\ConvertSwitchToIfTests.cs" />
     <Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" />
     <Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" />