IDEA-CR-53066 java smart completion: autoinsert likely generic methods

GitOrigin-RevId: 6dcca0e0c39758de0a9c3bb77ded8b2c61ad4cf0

java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java

@@ -501,7 +501,11 @@ public class JavaCompletionSorting {
       type = callItem.getSubstitutor().substitute(type);
     }
 
-    return type instanceof PsiClassType && ((PsiClassType)type).resolve() instanceof PsiTypeParameter;
+    if (type instanceof PsiClassType) {
+      PsiClass target = ((PsiClassType)type).resolve();
+      return target instanceof PsiTypeParameter && ((PsiTypeParameter)target).getOwner() instanceof PsiMethod;
+    }
+    return false;
   }
 
   private static class PreferSimple extends LookupElementWeigher {

java/java-tests/testData/codeInsight/completion/smartType/AutoInsertMethodReturningClassTypeParam-out.java

@@ -0,0 +1,6 @@
+abstract class K<T> {
+  protected abstract T get();
+  private void m() {
+    T t = get();<caret>
+  }
+}

java/java-tests/testData/codeInsight/completion/smartType/AutoInsertMethodReturningClassTypeParam.java

@@ -0,0 +1,6 @@
+abstract class K<T> {
+  protected abstract T get();
+  private void m() {
+    T t = g<caret>
+  }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/completion/SmartTypeCompletionTest.java

@@ -606,6 +606,8 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
     myFixture.assertPreferredCompletionItems(0, "valueOf");
   }
 
+  public void testAutoInsertMethodReturningClassTypeParam() { doActionTest(); }
+
   public void testIntPlusLongNotDouble() { doTest(); }
 
   public void testNestedAssignments() { doTest(); }