MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

java completion: no case enumConstant suggestions where inapplicable (IDEA-168749)

Browse Source
This commit is contained in:
peter
2017-02-27 14:53:56 +01:00
parent dfa6ae7f6f
commit 2dcd8d24ba
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
View File

@@ -328,7 +328,11 @@ public class JavaKeywordCompletion {
private static PsiSwitchStatement getSwitchFromLabelPosition(PsiElement position) {
PsiStatement statement = PsiTreeUtil.getParentOfType(position, PsiStatement.class, false, PsiMember.class);
if (statement != null && !(statement instanceof PsiSwitchLabelStatement) && statement.getParent() instanceof PsiCodeBlock) {
if (statement == null || statement.getTextRange().getStartOffset() != position.getTextRange().getStartOffset()) {
return null;
}
if (!(statement instanceof PsiSwitchLabelStatement) && statement.getParent() instanceof PsiCodeBlock) {
return ObjectUtils.tryCast(statement.getParent().getParent(), PsiSwitchStatement.class);
}
return null;

13
java/java-tests/testData/codeInsight/completion/normal/InsideSwitchCaseWithEnumConstant.java Normal file
View File

@@ -0,0 +1,13 @@
class A extends Base{
void foo(B b){
switch(b) {
case FOO:
b.<caret>
}
}
}
enum B{
FOO, BAR, GOO
}

5
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
View File

@@ -295,6 +295,11 @@ class NormalCompletionTest extends LightFixtureCompletionTestCase {
void testSecondSwitchCaseWithEnumConstant() { doTest() }
void testInsideSwitchCaseWithEnumConstant() {
configure()
myFixture.assertPreferredCompletionItems 0, 'compareTo', 'equals'
}
void testMethodInAnnotation() throws Exception {
configureByFile("Annotation.java")
checkResultByFile("Annotation_after.java")