[extract method] IDEA-317499: infer type arguments for class usage parameters ('this')

GitOrigin-RevId: 7e1b558415ac7a7d381287e99bf54ce87eeef6cb

java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractOptionsPipeline.kt

@@ -228,7 +228,7 @@ object ExtractMethodPipeline {
     val name = member.name ?: return null
     val type = when (member) {
       is PsiField -> member.type
-      is PsiClass -> PsiTypesUtil.getClassType(member)
+      is PsiClass -> usages.firstOrNull()?.type ?: PsiTypesUtil.getClassType(member)
       else -> return null
     }
     return InputParameter(usages, StringUtil.decapitalize(name), type)

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/PassThisAsParameter.java

@@ -0,0 +1,5 @@
+public class Test<K> {
+    public Test<K> test() {
+        <selection>return this;</selection>
+    }
+}

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/PassThisAsParameter_after.java

@@ -0,0 +1,9 @@
+public class Test<K> {
+    public Test<K> test() {
+        return getkTest(this);
+    }
+
+    private static <K> Test<K> getkTest(Test<K> test) {
+        return test;
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt

@@ -504,6 +504,11 @@ class ExtractMethodAndDuplicatesInplaceTest: LightJavaCodeInsightTestCase() {
     doTest()
   }
 
+  fun testPassThisAsParameter(){
+    JavaRefactoringSettings.getInstance().EXTRACT_STATIC_METHOD_AND_PASS_FIELDS = true
+    doTest()
+  }
+
   fun testRefactoringListener(){
     templateTest {
       configureByFile("$BASE_PATH/${getTestName(false)}.java")