pull up/push down: type parameters can be used in type parameters list as well as type elements (IDEA-57268)

java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java

@@ -885,7 +885,12 @@ public class RefactoringUtil {
         if (substitutedType == null) {
           substitutedType = TypeConversionUtil.erasure(factory.createType(parameter));
         }
-        element.getParent().replace(factory.createTypeElement(substitutedType));
+        final PsiElement parent = element.getParent();
+        if (parent instanceof PsiTypeElement) {
+          parent.replace(factory.createTypeElement(substitutedType));
+        } else if (element instanceof PsiJavaCodeReferenceElement && substitutedType instanceof PsiClassType) {
+          element.replace(factory.createReferenceElementByType((PsiClassType)substitutedType));
+        }
       }
     }
   }

java/java-tests/testData/refactoring/pushDown/MethodTypeParametersList.java

@@ -0,0 +1,6 @@
+public class Test<T> {
+  <S extends T> void f<caret>oo(){}
+}
+
+class B extends Test<Throwable>{
+}

java/java-tests/testData/refactoring/pushDown/MethodTypeParametersList.java.after

@@ -0,0 +1,6 @@
+public class Test<T> {
+}
+
+class B extends Test<Throwable>{
+    <S extends Throwable> void foo(){}
+}

java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java

@@ -105,4 +105,8 @@ public class PushDownTest extends LightCodeInsightTestCase {
   public void testSuperOverHierarchy() throws Exception {
     doTest();
   }
+
+  public void testMethodTypeParametersList() throws Exception {
+    doTest();
+  }
 }