java completion: suggest 'package' after javadoc

This commit is contained in:
peter
2017-07-18 14:46:56 +02:00
parent d9c98c9537
commit 4b6aa72d74
3 changed files with 4 additions and 1 deletions
@@ -200,7 +200,7 @@ public class JavaKeywordCompletion {
}
private static PsiElement prevSignificantLeaf(PsiElement position) {
return JBIterable.generate(position, PsiTreeUtil::prevVisibleLeaf).skip(1).skipWhile(e -> e instanceof PsiComment).first();
return JBIterable.generate(position, PsiTreeUtil::prevVisibleLeaf).skip(1).skipWhile(e -> PsiTreeUtil.getNonStrictParentOfType(e, PsiComment.class) != null).first();
}
private void addKeyword(LookupElement element) {
@@ -0,0 +1,2 @@
/** javadoc */
<caret>
@@ -47,6 +47,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
public void testFileScope1() { doTest(8, FILE_SCOPE_KEYWORDS); }
public void testFileScopeAfterComment() { doTest(4, "package", "class", "import", "public", "private"); }
public void testFileScopeAfterJavaDoc() { doTest(4, "package", "class", "import", "public", "private"); }
public void testFileScope2() { doTest(7, CLASS_SCOPE_KEYWORDS); }
public void testClassScope1() { doTest(5, CLASS_SCOPE_KEYWORDS); }
public void testClassScope2() { doTest(4, CLASS_SCOPE_KEYWORDS); }