Added inline local variable action.

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

@@ -351,6 +351,7 @@
     <Compile Include="Refactoring\CodeActions\CreateMethodDeclarationAction.cs" />
     <Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingConventionService.cs" />
     <Compile Include="Refactoring\CodeActions\CreateIndexerAction.cs" />
+    <Compile Include="Refactoring\CodeActions\InlineLocalVariableAction.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">

ICSharpCode.NRefactory.CSharp/Refactoring/BaseRefactoringContext.cs

@@ -52,7 +52,15 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		}
 		
 		public virtual AstNode RootNode {
-			get { return resolver.RootNode; }
+			get {
+				return resolver.RootNode;
+			}
+		}
+
+		public virtual CSharpParsedFile ParsedFile {
+			get {
+				return resolver.ParsedFile;
+			}
 		}
 
 		public ICompilation Compilation {

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

@@ -0,0 +1,63 @@
+// 
+// InlineLocalVariableAction.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.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.Threading;
+using System.Collections.Generic;
+using System.Linq;
+using ICSharpCode.NRefactory.Semantics;
+using ICSharpCode.NRefactory.CSharp.Resolver;
+
+namespace ICSharpCode.NRefactory.CSharp.Refactoring
+{
+	[ContextAction("Inline local variable", Description = "Inlines a local variable.")]
+	public class InlineLocalVariableAction : ICodeActionProvider
+	{
+		static FindReferences refFinder = new FindReferences();
+		public IEnumerable<CodeAction> GetActions(RefactoringContext context)
+		{
+			var node = context.GetNode<VariableDeclarationStatement>();
+			if (node == null || node.Variables.Count != 1) {
+				yield break;
+			}
+			var initializer = node.Variables.First();
+			if (!initializer.NameToken.Contains(context.Location) || initializer.Initializer.IsNull) {
+				yield break;
+			}
+			var resolveResult = context.Resolve(initializer) as LocalResolveResult;
+			if (resolveResult == null || resolveResult.IsError) {
+				yield break;
+			}
+			var unit = context.RootNode as CompilationUnit;
+			if (unit == null) {
+				yield break;
+			}
+			yield return new CodeAction(context.TranslateString("Inline local variable"), script => {
+				refFinder.FindLocalReferences(resolveResult.Variable, context.ParsedFile, unit, context.Compilation, (n, r) => script.Replace(n, initializer.Initializer.Clone()), default(CancellationToken));
+				script.Remove(node);
+			});
+		}
+	}
+}

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

@@ -29,11 +29,44 @@ using NUnit.Framework;
 using ICSharpCode.NRefactory.CSharp.Refactoring;
 using System.Threading;
 using System.Linq;
+using System.Text;
 
 namespace ICSharpCode.NRefactory.CSharp.CodeActions
 {
 	public abstract class ContextActionTestBase
 	{
+		internal static string HomogenizeEol (string str)
+		{
+			var sb = new StringBuilder ();
+			for (int i = 0; i < str.Length; i++) {
+				var ch = str [i];
+				if (ch == '\n') {
+					sb.AppendLine ();
+				} else if (ch == '\r') {
+					sb.AppendLine ();
+					if (i + 1 < str.Length && str [i + 1] == '\n')
+						i++;
+				} else {
+					sb.Append (ch);
+				}
+			}
+			return sb.ToString ();
+		}
+
+		public void Test<T> (string input, string output) where T : ICodeActionProvider, new ()
+		{
+			string result = RunContextAction (new T (), HomogenizeEol (input));
+			bool passed = result == output;
+			if (!passed) {
+				Console.WriteLine ("-----------Expected:");
+				Console.WriteLine (output);
+				Console.WriteLine ("-----------Got:");
+				Console.WriteLine (result);
+			}
+			Assert.AreEqual (HomogenizeEol (output), result);
+		}	
+	
+
 		protected static string RunContextAction (ICodeActionProvider action, string input)
 		{
 			var context = TestRefactoringContext.Create (input);

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

@@ -33,24 +33,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class CreateMethodDeclarationTests : ContextActionTestBase
 	{
-		internal static string HomogenizeEol (string str)
-		{
-			var sb = new StringBuilder ();
-			for (int i = 0; i < str.Length; i++) {
-				var ch = str [i];
-				if (ch == '\n') {
-					sb.AppendLine ();
-				} else if (ch == '\r') {
-					sb.AppendLine ();
-					if (i + 1 < str.Length && str [i + 1] == '\n')
-						i++;
-				} else {
-					sb.Append (ch);
-				}
-			}
-			return sb.ToString ();
-		}
-
 		public void TestCreateMethod (string input, string output)
 		{
 			string result = RunContextAction (new CreateMethodDeclarationAction (), HomogenizeEol (input));

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

@@ -0,0 +1,56 @@
+// 
+// InlineLocalVariableTests.cs
+//  
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+// 
+// Copyright (c) 2012 Xamarin Inc. (http://xamarin.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;
+using NUnit.Framework;
+using ICSharpCode.NRefactory.CSharp.Refactoring;
+
+namespace ICSharpCode.NRefactory.CSharp.CodeActions
+{
+	[TestFixture]
+	public class InlineLocalVariableTests : ContextActionTestBase
+	{
+		[Test()]
+		public void TestSimpleInline ()
+		{
+			Test<InlineLocalVariableAction> (@"class TestClass
+{
+	void Test ()
+	{
+		int $tmp = 5 + 6;
+		Console.WriteLine (tmp);
+	}
+}", @"class TestClass
+{
+	void Test ()
+	{
+		Console.WriteLine (5 + 6);
+	}
+}");
+		}
+			
+	}
+}

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

@@ -254,6 +254,7 @@
     <Compile Include="CSharp\CodeActions\CreatePropertyTests.cs" />
     <Compile Include="CSharp\CodeActions\CreateMethodDeclarationTests.cs" />
     <Compile Include="CSharp\CodeActions\CreateIndexerTests.cs" />
+    <Compile Include="CSharp\CodeActions\InlineLocalVariableTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">