java smart completion: don't suggest generic call variants with inapplicable types

java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java

@@ -119,7 +119,8 @@ public class AssignableFromFilter implements ElementFilter{
                                                                                       expectedType,
                                                                                       false,
                                                                                       PsiUtil.getLanguageLevel(place));
-      if (substitutionForParameter != PsiType.NULL && !(substitutionForParameter instanceof PsiIntersectionType)) {
+      if (substitutionForParameter != PsiType.NULL && !(substitutionForParameter instanceof PsiIntersectionType) &&
+        PsiUtil.resolveClassInClassTypeOnly(substitutionForParameter) != parameter) {
         return true;
       }
     }

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

@@ -0,0 +1,13 @@
+class A {
+  {
+    Func2<String,String> f = ge<caret>x
+  }
+
+  <T,V> Func1<T,V> get1() {}
+  <T,V> Func2<T,V> get2() {}
+
+}
+
+
+interface Func1<T, V> {}
+interface Func2<T, V> {}

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

@@ -175,4 +175,9 @@ public void testConvertToObjectStream() {
     }
     checkResultByFile("/" + getTestName(false) + "-out.java");
   }
+
+  public void testOnlyCompatibleTypes() {
+    configureByTestName();
+    assertOrderedEquals(myFixture.getLookupElementStrings(), "get2");
+  }
 }

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

@@ -1232,4 +1232,9 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
   private CommonCodeStyleSettings getCodeStyleSettings() {
     return CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE);
   }
+
+  public void testOnlyCompatibleTypes() {
+    configureByTestName();
+    assertOrderedEquals(myFixture.getLookupElementStrings(), "get2");
+  }
 }