From 1797fa2c045ac482e7c1c633167e7b2a3c51f505 Mon Sep 17 00:00:00 2001 From: Simon Lindgren Date: Fri, 10 Aug 2012 12:15:06 +0200 Subject: [PATCH] [CodeActions] Add convertAnonymousDelegateToLambdaAction. --- .../ICSharpCode.NRefactory.CSharp.csproj | 1 + .../ConvertAnonymousDelegateToLambdaAction.cs | 61 ++++++++++++ .../ConvertAnonymousDelegateToLambdaTests.cs | 93 +++++++++++++++++++ .../ICSharpCode.NRefactory.Tests.csproj | 2 +- 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs create mode 100644 ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj index 93dbc6fe18..8aab618c4b 100644 --- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj +++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj @@ -429,6 +429,7 @@ + diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs new file mode 100644 index 0000000000..23abf7a506 --- /dev/null +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ConvertAnonymousDelegateToLambdaAction.cs @@ -0,0 +1,61 @@ +// +// ConvertAnonymousDelegateToExpression.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. + +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 + { + #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 + } +} + diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs new file mode 100644 index 0000000000..7768848404 --- /dev/null +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertAnonymousDelegateToLambdaTests.cs @@ -0,0 +1,93 @@ +// +// ConvertAnonymousDelegateToExpressionTests.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 NUnit.Framework; +using ICSharpCode.NRefactory.CSharp.Refactoring; + +namespace ICSharpCode.NRefactory.CSharp.CodeActions +{ + [TestFixture] + public class ConvertAnonymousDelegateToLambdaTests : ContextActionTestBase + { + [Test] + public void BasicTest () + { + Test(@" +class A +{ + void F () + { + System.Action action = delegate$ (int i1, int i2) { System.Console.WriteLine (i1); }; + } +}", @" +class A +{ + void F () + { + System.Action action = (i1, i2) => { + System.Console.WriteLine (i1); +}; + } +}"); + } + + [Test] + public void VarDeclaration () + { + Test(@" +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(@" +class A +{ + void F () + { + System.Action = delegate$ { System.Console.WriteLine (i); }; + } +}"); + } + } +} + diff --git a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj index 99a62fcb7a..a49c88b48e 100644 --- a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj +++ b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj @@ -299,6 +299,7 @@ + @@ -331,7 +332,6 @@ -