From 939e034fb41b77c08081dc793c550dccf8d10978 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Apr 2012 18:10:27 +0200 Subject: [PATCH] enable the scary fix for IDEA-83714 Non-existent class in generic arguments trips the smart auto-completion component --- .../intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java | 2 -- .../codeInsight/completion/SmartTypeCompletionTest.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java index 56ff172eab0d..323dca8aeba9 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java @@ -470,11 +470,9 @@ public class PsiResolveHelperImpl implements PsiResolveHelper { PsiType bound = intersectAllExtends(typeParam, arg); return new Pair(bound, ConstraintType.SUPERTYPE); } - /* if (psiClass == null && arg instanceof PsiClassType) { return Pair.create(arg, ConstraintType.EQUALS); } - */ return null; } if (paramClass == null) return null; diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index 53a49e027f19..95d367151870 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -234,7 +234,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { } public void testCastInThrow() throws Exception { doTest(); } - public void _testNonExistentGenericAfterNew() throws Exception { doTest(); } + public void testNonExistentGenericAfterNew() throws Exception { doTest(); } public void testParenAfterNewWithinInnerExpr() throws Exception { String path = "/afterNew";