diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java index b1d21255ec23..ca9a446fa1da 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java @@ -674,7 +674,7 @@ public class JavaKeywordCompletion { if (parent instanceof PsiVariable) parent = parent.getParent(); return parent instanceof PsiCatchSection || parent instanceof PsiResourceList; } - return false; + return psiElement().insideStarting(psiElement(PsiResourceExpression.class)).accepts(position); } private void addBreakContinue() { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java index 85b0d9063419..b401dbe1c37f 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/KeywordCompletionTest.java @@ -142,7 +142,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase { public void testFinalInCatch() { doTest(1, "final"); } public void testFinalInIncompleteCatch() { doTest(1, "final"); } public void testFinalInCompleteCatch() { doTest(1, "final"); } - public void testFinalInTryWithResources() { doTest(1, "final", "float", "class"); } + public void testFinalInTryWithResources() { doTest(1, "final", "class"); } public void testFinalInCompleteTryWithResources() { doTest(1, "final", "float", "class"); } public void testFinalInLambda() { doTest(2, "final", "float"); } public void testNoFinalAfterTryBody() { doTest(1, "final", "finally"); }