1 files changed, 2 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
index 61d8abe18368..d5e04ce3f95a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
@@ -158,8 +158,9 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
             @Override
             public void consume(PsiType type) {
               final PsiClass psiClass = PsiUtil.resolveClassInType(type);
-              if (psiClass == null) return;
+              if (psiClass == null || psiClass instanceof PsiTypeParameter) return;
 
+              //noinspection SuspiciousMethodCalls
               if (expectedClassTypes.contains(type)) return;
 
               result.addElement(createInstanceofLookupElement(psiClass, parameterizedTypes));