[Refactoring] Don't suggest names that are used in a parent scope when falling back to numbered names.

ICSharpCode.NRefactory.CSharp/Refactoring/NamingHelper.cs

@@ -119,7 +119,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			string firstSuggestion = null;
 			foreach (var name in NamingHelper.GenerateNameProposals(type)) {
 				firstSuggestion = firstSuggestion ?? name;
-				if (!UsedVariableNames.Contains(name) && LookupVariable(name) == null)
+				if (NameIsUnused(name))
 					return name;
 			}
 			// If we get here, all of the standard suggestions are already used.
@@ -128,10 +128,15 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			string proposedName;
 			do {
 				proposedName = firstSuggestion + counter++;
-			} while (UsedVariableNames.Contains(proposedName));
+			} while (!NameIsUnused(proposedName));
 			return proposedName;
 		}
 
+		bool NameIsUnused(string name)
+		{
+			return !UsedVariableNames.Contains(name) && LookupVariable(name) == null;
+		}
+
 		/// <summary>
 		/// Generates a variable name for a variable of the specified type.
 		/// </summary>

ICSharpCode.NRefactory.Tests/CSharp/Refactoring/NamingHelperTests.cs

@@ -37,7 +37,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 				RefactoringContext MakeContext(string input, bool expectErrors = false)
 				{
-			var context = TestRefactoringContext.Create (input, expectErrors);
+						var context = TestRefactoringContext.Create(input, expectErrors);
 						return context;
 				}
 
@@ -49,7 +49,8 @@ class A
 {
 	void F()
 	{ $ }
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.AreEqual("i", name);
@@ -66,7 +67,8 @@ class A
 		int i;
 		$
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsFalse(name == "i", "i was already used and should not be proposed.");
@@ -83,7 +85,8 @@ class A
 		$
 		int i;
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsFalse(name == "i", "i was already used and should not be proposed.");
@@ -100,7 +103,8 @@ class A
 		$
 		for (int i; i < 0; i++);
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsFalse(name == "i", "i was already used and should not be proposed.");
@@ -133,7 +137,8 @@ class A
 	{
 		$
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsFalse(name == "i", "i was already used and should not be proposed.");
@@ -149,12 +154,34 @@ class A
 	{
 		for($ ; i < 0; i++);
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsFalse(name == "i", "i was already used and should not be proposed.");
 				}
 
+				[Test]
+				public void GenerateVariableNameWithNumberedVariableInParentBlock()
+				{
+						var context = MakeContext(@"
+class A
+{
+	void F()
+	{
+		int i2;
+		{
+			int i, j, k;
+			$
+		}
+	}
+}"
+						);
+						var name = context.GenerateVariableName(new PrimitiveType("int"));
+						Assert.NotNull(name);
+						Assert.AreEqual("i3", name);
+				}
+
 				[Test]
 				public void GenerateVariableNameShouldNotIgnoreBasedOnMethodCallIdentifiers()
 				{
@@ -173,7 +200,8 @@ class A
 		for($ ;;)
 			B.i();
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.IsTrue(name == "i");
@@ -191,7 +219,8 @@ class A
 		$
 		var ints = from i in new int [] {} group i by i % 2 into j let k = 2 select j.Count() + k;
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.AreEqual("i2", name);
@@ -209,7 +238,8 @@ class A
 		$
 		fixed (int i = 13) {}
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.AreEqual("j", name);
@@ -226,7 +256,8 @@ class A
 		int i, j, k;
 		$
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new PrimitiveType("int"));
 						Assert.NotNull(name);
 						Assert.AreEqual("i2", name);
@@ -242,7 +273,8 @@ class A
 	{
 		$
 	}
-}");
+}"
+						);
 						var name = context.GenerateVariableName(new SimpleType() { Identifier = "VariableNameGenerationTester" });
 						Assert.NotNull(name);
 						Assert.AreEqual("variableNameGenerationTester", name);