From be801000c77e48c36aad821055316e339e54103f Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Thu, 12 Oct 2017 12:02:15 +0200 Subject: [PATCH] keep non-member types from being raw (revert) --- java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java | 4 +--- .../java/codeInsight/daemon/GenericsHighlightingTest.java | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index 911399da0972..6c0b646df8e9 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -911,9 +911,7 @@ public final class PsiUtil extends PsiUtilCore { } if (currentOwner.hasModifierProperty(PsiModifier.STATIC)) break; - currentOwner = currentOwner instanceof PsiClass && isLocalOrAnonymousClass((PsiClass)currentOwner) - ? PsiTreeUtil.getParentOfType(currentOwner, PsiClass.class) - : currentOwner.getContainingClass(); + currentOwner = currentOwner.getContainingClass(); } if (result == null) return EmptyIterable.getInstance(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java index 8047d70ad8b5..1db66d660d67 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java @@ -20,6 +20,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection; import com.intellij.codeInspection.uncheckedWarnings.UncheckedWarningLocalInspection; import com.intellij.codeInspection.unusedImport.UnusedImportInspection; +import com.intellij.idea.Bombed; import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.LanguageLevelProjectExtension; @@ -31,6 +32,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NotNull; +import java.util.Calendar; + public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/genericsHighlighting"; @@ -425,6 +428,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testAvoidDblSubstitutionDuringErasureOfParameterTypesOfMethodSignature() { doTest8Incompatibility(false); } public void testUncheckedWarningWhenCastingFromCapturedWildcard() { doTest8Incompatibility(true); } public void testEnclosingRefInTopLevelClassExtendingInnerWhichExtendsItsOuter() { doTest8Incompatibility(true); } + @Bombed(day = 13, month = Calendar.OCTOBER, user = "anna") public void testGenericThrowTypes() { doTest5(false); } public void testClassInWrongPackage() { doTest6(false); } public void testRecursiveParamBoundsWhenSuperSubstitution() { doTest6(false); }