From 7e5b682ab39e8880ff971d757da80b4b3f918007 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 30 Apr 2013 20:18:40 +0200 Subject: [PATCH] local classes visibility scope (IDEA-67798) --- .../impl/source/tree/java/PsiDeclarationStatementImpl.java | 2 +- .../daemonCodeAnalyzer/genericsHighlighting/IDEA67798.java | 6 ++++++ .../codeInsight/daemon/GenericsHighlightingTest.java | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67798.java diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java index 9186dd042753..088b56bd9d48 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java @@ -109,7 +109,7 @@ public class PsiDeclarationStatementImpl extends CompositePsiElement implements final ElementClassHint hint = processor.getHint(ElementClassHint.KEY); if (lastParent instanceof PsiClass) { if (hint == null || hint.shouldProcess(ElementClassHint.DeclarationKind.CLASS)) { - processor.execute(lastParent, state); + if (!processor.execute(lastParent, state)) return false; } } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67798.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67798.java new file mode 100644 index 000000000000..dda17fdeb07f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA67798.java @@ -0,0 +1,6 @@ +class A { + { + class T extends A {} + } + class T extends A {} +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java index c9b86cfb137a..03ff60bbdf29 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java @@ -210,6 +210,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA104992(){ doTest5(false); } public void testIDEA57446(){ doTest5(false); } public void testIDEA67677(){ doTest5(false); } + public void testIDEA67798(){ doTest5(false); } public void testWildcardsOnRawTypes() { doTest5(false); } public void testDisableWithinBoundsCheckForSuperWildcards() {