[CodeAction] Added JoinDeclarationAndAssignmentAction

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

@@ -253,6 +253,7 @@
     <Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" />
     <Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" />
     <Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" />
+    <Compile Include="Refactoring\CodeActions\JoinDeclarationAndAssignmentAction.cs" />
     <Compile Include="Refactoring\CodeActions\JoinStringAction.cs" />
     <Compile Include="Refactoring\CodeActions\MergeNestedIfAction.cs" />
     <Compile Include="Refactoring\CodeActions\NegateRelationalExpressionAction.cs" />

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

@@ -0,0 +1,63 @@
+// 
+// JoinDeclarationAndAssignmentAction.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.PatternMatching;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction ("Join local variable declaration and assignment",
+					Description = "Join local variable declaration and assignment.")]
+	public class JoinDeclarationAndAssignmentAction : SpecializedCodeAction<VariableInitializer>
+	{
+		protected override CodeAction GetAction (RefactoringContext context, VariableInitializer node)
+		{
+			var variableDecl = node.Parent as VariableDeclarationStatement;
+			if (variableDecl == null || !node.Initializer.IsNull)
+				return null;
+
+			var assignmentPattern = new ExpressionStatement(
+				new AssignmentExpression (new IdentifierExpression (node.Name), new AnyNode ("value")));
+			var match = assignmentPattern.Match (variableDecl.NextSibling);
+			if (!match.Success)
+				return null;
+
+			return new CodeAction (context.TranslateString ("Join local variable declaration and assignment"), script => {
+				var jointVariableDecl = new VariableDeclarationStatement (variableDecl.Type.Clone (),
+					node.Name, match.Get<Expression> ("value").First ().Clone ());
+				script.Replace (variableDecl.NextSibling, jointVariableDecl);
+				if (variableDecl.Variables.Count == 1) {
+					script.Remove (variableDecl);
+				} else {
+					var newVariableDecl = new VariableDeclarationStatement { Type = variableDecl.Type.Clone () };
+					foreach (var variable in variableDecl.Variables.Where (variable => variable != node))
+						newVariableDecl.Variables.Add ((VariableInitializer) variable.Clone ());
+					script.Replace (variableDecl, newVariableDecl);
+				}
+			});
+		}
+	}
+}

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

@@ -0,0 +1,78 @@
+// 
+// JoinDeclarationAndAssignmentTests.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 JoinDeclarationAndAssignmentTests : ContextActionTestBase
+	{
+		[Test]
+		public void Test ()
+		{
+			Test<JoinDeclarationAndAssignmentAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int $a;
+		a = 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int a = 1;
+	}
+}");
+		}
+
+		[Test]
+		public void TestDeclarationList ()
+		{
+			Test<JoinDeclarationAndAssignmentAction> (@"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int a, $b;
+		b = 1;
+	}
+}", @"
+class TestClass
+{
+	void TestMethod ()
+	{
+		int a;
+		int b = 1;
+	}
+}");
+		}
+	}
+}

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

@@ -94,6 +94,7 @@
     <Compile Include="CSharp\CodeActions\CreateCustomEventImplementationTests.cs" />
     <Compile Include="CSharp\CodeActions\CreateOverloadWithoutParameterTests.cs" />
     <Compile Include="CSharp\CodeActions\ExtractAnonymousMethodTests.cs" />
+    <Compile Include="CSharp\CodeActions\JoinDeclarationAndAssignmentTests.cs" />
     <Compile Include="CSharp\CodeActions\JoinStringTests.cs" />
     <Compile Include="CSharp\CodeActions\MergeNestedIfTests.cs" />
     <Compile Include="CSharp\CodeActions\NegateRelationalExpressionTests.cs" />