don't qualify magic method calls unless it's really needed. qualify instance magic methods with 'this'

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

@@ -103,7 +103,7 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
 
     final int startOffset = context.getStartOffset();
     final OffsetKey refStart = context.trackOffset(startOffset, true);
-    if (SmartCompletionDecorator.hasUnboundTypeParams(method)) {
+    if (shouldInsertTypeParameters(context)) {
       qualifyMethodCall(file, startOffset, document);
       insertExplicitTypeParameters(context, refStart);
     }
@@ -133,6 +133,17 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
 
   }
 
+  private boolean shouldInsertTypeParameters(InsertionContext context) {
+    final PsiElement leaf = context.getFile().findElementAt(context.getStartOffset());
+    if (PsiTreeUtil.getParentOfType(leaf, PsiExpressionList.class, true, PsiCodeBlock.class, PsiModifierListOwner.class) == null) {
+      if (PsiTreeUtil.getParentOfType(leaf, PsiConditionalExpression.class, true, PsiCodeBlock.class, PsiModifierListOwner.class) == null) {
+        return false;
+      }
+    }
+
+    return SmartCompletionDecorator.hasUnboundTypeParams(getObject());
+  }
+
   private boolean insertExplicitTypeParameters(InsertionContext context, OffsetKey refStart) {
     context.commitDocument();
 
@@ -169,10 +180,7 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
     final PsiMethod method = getObject();
     if (!method.hasModifierProperty(PsiModifier.STATIC)) {
       document.insertString(startOffset, "this.");
-
-      if (method.getManager().areElementsEquivalent(myContainingClass, PsiTreeUtil.findElementOfClassAtOffset(file, startOffset, PsiClass.class, false))) {
-        return;
-      }
+      return;
     }
 
     document.insertString(startOffset, ".");

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

@@ -0,0 +1,13 @@
+import java.io.File;
+
+public class Super {
+  protected <T> T foo() {}
+}
+
+public class Foo extends Super {
+    {
+        bar(this.<File>foo());<caret>
+    }
+
+    void bar(java.io.File s) {}
+}

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

@@ -0,0 +1,11 @@
+public class Super {
+  protected <T> T foo() {}
+}
+
+public class Foo extends Super {
+    {
+        bar(fo<caret>)
+    }
+
+    void bar(java.io.File s) {}
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -676,4 +676,26 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     """
   }
 
+  public void testInstanceMagicMethod() throws Exception {
+    myFixture.configureByText("a.java", """
+      public class JavaClass {
+          <T> T magic() {}
+
+          void foo() {
+              mag<caret>
+          }
+      }
+      """)
+    myFixture.completeBasic()
+    myFixture.checkResult """
+      public class JavaClass {
+          <T> T magic() {}
+
+          void foo() {
+              magic()<caret>
+          }
+      }
+      """
+  }
+
 }

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

@@ -961,6 +961,8 @@ public class SmartTypeCompletionTest extends LightCompletionTestCase {
 
   public void testExplicitMethodTypeParametersQualify() throws Throwable { doTest(); }
 
+  public void testExplicitMethodTypeParametersFromSuperClass() throws Throwable { doTest(); }
+
   public void testWildcardedInstanceof() throws Throwable { doTest(); }
   public void testWildcardedInstanceof2() throws Throwable { doTest(); }
   public void testWildcardedInstanceof3() throws Throwable { doTest(); }