Add methods even when a template kind is selected.

Author: pfcoperez

src/main/scala/scala/tools/refactoring/implementations/ImplementMethods.scala

@@ -37,11 +37,17 @@ abstract class ImplementMethods extends MultiStageRefactoring with analysis.Inde
 
   override def prepare(s: Selection): Either[PreparationError, PreparationResult] = {
 
+
+    // Expand the selection to the concrete type when a kind was initially selected.
+    val maybeSelectedTemplate = (s::s.expandToNextEnclosingTree.toList) flatMap { sel: Selection =>
+      index.declaration(sel.enclosingTree.symbol)
+    } collectFirst {
+      case templateDeclaration: ClassDef => templateDeclaration
+    }
+
     // Get a sequence of methods found in the selected mixed trait.
     val methodsToImplement = for {
-      selectedTemplateDeclaration <- index.declaration(s.enclosingTree.symbol).toSeq collect {
-        case templateDeclaration: ClassDef => templateDeclaration
-      }
+      selectedTemplateDeclaration <- maybeSelectedTemplate.toList
       unimplementedMethod <- selectedTemplateDeclaration.impl.body collect {
         case methodDeclaration: DefDef if methodDeclaration.rhs.isEmpty =>
           methodDeclaration

src/test/scala/scala/tools/refactoring/tests/implementations/ImplementMethodsTest.scala

@@ -124,4 +124,73 @@ class ImplementMethodsTest extends TestHelper with TestRefactoring {
     """.stripMargin
   } applyRefactoring implementMethods
 
+  @Test
+  def implementMethodsSelectType() = new FileSet() {
+    """
+      |package implementMethods
+      |
+      |trait T[T] {
+      |  def f[T]: T
+      |}
+      |
+      |class C extends /*(*/T[Int]/*)*/ {
+      |
+      |  def g(x: Int): Int = ???
+      |
+      |}
+    """.stripMargin becomes
+    """
+      |package implementMethods
+      |
+      |trait T[T] {
+      |  def f[T]: T
+      |}
+      |
+      |class C extends /*(*/T[Int]/*)*/ {
+      |
+      |  def g(x: Int): Int = ???
+      |
+      |  def f[T]: T = {
+      |    ???
+      |  }
+      |
+      |}
+    """.stripMargin
+  } applyRefactoring implementMethods
+
+  @Test
+  def implementMethodsSelectKind() = new FileSet() {
+    """
+      |package implementMethods
+      |
+      |trait T[T] {
+      |  def f[T]: T
+      |}
+      |
+      |class C extends /*(*/T/*)*/[Int] {
+      |
+      |  def g(x: Int): Int = ???
+      |
+      |}
+    """.stripMargin becomes
+    """
+      |package implementMethods
+      |
+      |trait T[T] {
+      |  def f[T]: T
+      |}
+      |
+      |class C extends /*(*/T/*)*/[Int] {
+      |
+      |  def g(x: Int): Int = ???
+      |
+      |  def f[T]: T = {
+      |    ???
+      |  }
+      |
+      |}
+    """.stripMargin
+  } applyRefactoring implementMethods
+
+
 }