MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] skip errors and empty elements while checking whether semicolon is needed to be completed

Browse Source 
GitOrigin-RevId: b049999e082df5c42b6f3faa6a86b7849afaa24c
This commit is contained in:
Alexander Zolotov
2020-05-05 15:33:32 +00:00
committed by intellij-monorepo-bot
parent ca5c55d746
commit 48a671016e
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+13 -8
View File
@@ -763,7 +763,7 @@ public class JavaCompletionContributor extends CompletionContributor {
@Override
public boolean invokeAutoPopup(@NotNull PsiElement position, char typeChar) {
return typeChar == ':' && JavaTokenType.COLON == position.getNode().getElementType();
return typeChar == ':' && JavaTokenType.COLON == PsiUtilCore.getElementType(position);
}
private static boolean shouldSuggestSmartCompletion(final PsiElement element) {
@@ -876,28 +876,26 @@ public class JavaCompletionContributor extends CompletionContributor {
return true;
}
if (at != null && at.getNode().getElementType() == JavaTokenType.IDENTIFIER) {
if (PsiUtilCore.getElementType(at) == JavaTokenType.IDENTIFIER) {
at = PsiTreeUtil.nextLeaf(at);
}
at = skipWhitespacesAndComments(at);
if (at != null &&
at.getNode().getElementType() == JavaTokenType.LPARENTH &&
if (PsiUtilCore.getElementType(at) == JavaTokenType.LPARENTH &&
PsiTreeUtil.getParentOfType(ref, PsiExpression.class, PsiClass.class) == null) {
// looks like a method declaration, e.g. StringBui<caret>methodName() inside a class
return true;
}
if (at != null &&
at.getNode().getElementType() == JavaTokenType.COLON &&
if (PsiUtilCore.getElementType(at) == JavaTokenType.COLON &&
PsiTreeUtil.findElementOfClassAtOffset(file, startOffset, PsiConditionalExpression.class, false) == null) {
return true;
}
at = skipWhitespacesAndComments(at);
if (at == null || at.getNode().getElementType() != JavaTokenType.IDENTIFIER) {
if (PsiUtilCore.getElementType(at) != JavaTokenType.IDENTIFIER) {
return false;
}
@@ -910,7 +908,14 @@ public class JavaCompletionContributor extends CompletionContributor {
@Nullable
private static PsiElement skipWhitespacesAndComments(@Nullable PsiElement at) {
return at instanceof PsiWhiteSpace || at instanceof PsiComment ? PsiTreeUtil.skipWhitespacesAndCommentsForward(at) : at;
PsiElement nextLeaf = at;
while (nextLeaf != null && (nextLeaf instanceof PsiWhiteSpace ||
nextLeaf instanceof PsiComment ||
nextLeaf instanceof PsiErrorElement ||
nextLeaf.getTextLength() == 0)) {
nextLeaf = PsiTreeUtil.nextLeaf(nextLeaf, true);
}
return nextLeaf;
}
private static void autoImport(@NotNull final PsiFile file, int offset, @NotNull final Editor editor) {