Fixed abstract override in implement abstract members action.

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

@@ -84,10 +84,14 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			// Stub out non-implemented methods defined by @iface
 			foreach (var method in abstractType.GetMethods (d => !d.IsSynthetic  && d.IsAbstract)) {
 				alreadyImplemented = false;
-				
-				foreach (var cmet in implementingType.GetMethods ()) {
-					if (!cmet.IsAbstract && ImplementInterfaceAction.CompareMethods(method, cmet)) {
+
+				var allBaseTypes = method.DeclaringType.GetAllBaseTypes().ToList ();
+				foreach (var cmet in implementingType.GetMethods (d => !d.IsAbstract && d.Name == method.Name)) {
+					if (allBaseTypes.Contains(cmet.DeclaringType))
+						continue;
+					if (ImplementInterfaceAction.CompareMethods(method, cmet)) {
 						alreadyImplemented = true;
+						break;
 					}
 				}
 				if (!alreadyImplemented) 

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

@@ -32,7 +32,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 	[TestFixture]
 	public class ImplementAbstractMembersTest : ContextActionTestBase
 	{
-		[Test()]
+		[Test]
 		public void TestSimpleBaseType()
 		{
 			Test<ImplementAbstractMembersAction>(@"abstract class Simple {
@@ -58,7 +58,7 @@ class Foo : Simple
 ");
 		}
 
-		[Test()]
+		[Test]
 		public void TestProtectedMembers()
 		{
 			Test<ImplementAbstractMembersAction>(@"abstract class Simple {
@@ -85,7 +85,7 @@ class Foo : Simple
 ");
 		}
 
-		[Test()]
+		[Test]
 		public void TestProtectedInternalMembers()
 		{
 			Test<ImplementAbstractMembersAction>(@"abstract class Simple {
@@ -111,6 +111,91 @@ class Foo : Simple
 }
 ");
 		}
+	
+	
+		
+		[Test]
+		public void TestAbstractOverride()
+		{
+			Test<ImplementAbstractMembersAction>(@"class A {
+	public virtual void Foo() {
+		Console.WriteLine(""A:Foo()"");
+	}
+}
+
+abstract class B : A {
+	public abstract override void Foo();
+	public abstract void FooBar();
+}
+
+class C : $B
+{
+}
+", @"class A {
+	public virtual void Foo() {
+		Console.WriteLine(""A:Foo()"");
+	}
+}
+
+abstract class B : A {
+	public abstract override void Foo();
+	public abstract void FooBar();
+}
+
+class C : B
+{
+	#region implemented abstract members of B
+	public override void Foo ()
+	{
+		throw new System.NotImplementedException ();
+	}
+	public override void FooBar ()
+	{
+		throw new System.NotImplementedException ();
+	}
+	#endregion
+}
+");
+		}
+
+		
+
+		[Test]
+		public void TestAlreadyImplemented()
+		{
+			Test<ImplementAbstractMembersAction>(@"class A {
+	public abstract void Foo();
+	public abstract void FooBar();
+}
+
+abstract class B : A {
+	public override void Foo() {}
+}
+
+class C : $B
+{
+}
+", @"class A {
+	public abstract void Foo();
+	public abstract void FooBar();
+}
+
+abstract class B : A {
+	public override void Foo() {}
+}
+
+class C : B
+{
+	#region implemented abstract members of A
+	public override void FooBar ()
+	{
+		throw new System.NotImplementedException ();
+	}
+	#endregion
+}
+");
+		}
+
 	}
 }