IDEA-135554 Suggestion for class variable are incorrect

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
index 77c6eb0d17cc09458f98e24f886e1539eecf27ab..bede9bd170e5297ccb4878b0bc9c3e3e47c6d6b9 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -139,7 +139,7 @@ public class JavaCompletionData extends JavaAwareCompletionData {
     psiElement().afterLeaf(psiElement().withText("(").afterLeaf("for")).withParents(PsiJavaCodeReferenceElement.class,
                                                                                     PsiExpressionStatement.class, PsiForStatement.class);
   private static final PsiJavaElementPattern.Capture<PsiElement> CLASS_REFERENCE =
-    psiElement().withParent(psiReferenceExpression().referencing(psiClass()));
+    psiElement().withParent(psiReferenceExpression().referencing(psiClass().andNot(psiElement(PsiTypeParameter.class))));
 
   private static final ElementPattern<PsiElement> EXPR_KEYWORDS = and(
     psiElement().withParent(psiElement(PsiReferenceExpression.class).withParent(

diff --git a/java/java-tests/testData/codeInsight/completion/normal/NothingAfterTypeParameterQualifier.java b/java/java-tests/testData/codeInsight/completion/normal/NothingAfterTypeParameterQualifier.java
new file mode 100644 (file)
index 0000000..1d321aa
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/NothingAfterTypeParameterQualifier.java
@@ -0,0 +1,6 @@
+public class MyFirstTestClassFoo {
+
+  public <T> T getSomething(){
+    Class klazz = T.<caret>;
+  }
+}
\ No newline at end of file

diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index ad932fc867355118a48adce4afe840b6bb561fa1..dd28f479f41ca84acf690c1de1e625bae108998d 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -675,6 +675,7 @@ public class ListUtils {
   }
 
   public void testNothingAfterNumericLiteral() throws Throwable { doAntiTest(); }
+  public void testNothingAfterTypeParameterQualifier() { doAntiTest(); }
 
   public void testSpacesAroundEq() throws Throwable { doTest('='); }