IDEA-88181 Java: complete 'return' in conditional expression

This commit is contained in:
peter
2012-07-03 12:52:32 +02:00
parent 08bd059657
commit 59466627be
4 changed files with 8 additions and 2 deletions
@@ -628,7 +628,7 @@ public class JavaCompletionData extends JavaAwareCompletionData {
return false;
}
if (psiElement().withSuperParent(2, PsiConditionalExpression.class).accepts(position)) {
if (psiElement().withSuperParent(2, PsiConditionalExpression.class).andNot(psiElement().insideStarting(psiElement(PsiConditionalExpression.class))).accepts(position)) {
return false;
}