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

JavaCompletionContributor: extract dummy identifier calculation in a separate method

Browse Source
This commit is contained in:
peter
2018-07-30 06:38:52 -07:00
parent 2fe6ef2a76
commit 26b334c9de
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+27 -23
View File
@@ -776,33 +776,37 @@ public class JavaCompletionContributor extends CompletionContributor {
}
}
if (context.getCompletionType() == CompletionType.BASIC) {
if (PsiTreeUtil.findElementOfClassAtOffset(file, context.getStartOffset() - 1, PsiReferenceParameterList.class, false) != null) {
context.setDummyIdentifier(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED);
return;
}
if (semicolonNeeded(context.getEditor(), file, context.getStartOffset())) {
context.setDummyIdentifier(CompletionInitializationContext.DUMMY_IDENTIFIER.trim() + ";");
return;
}
PsiJavaCodeReferenceElement ref = PsiTreeUtil.findElementOfClassAtOffset(file, context.getStartOffset(), PsiJavaCodeReferenceElement.class, false);
if (ref != null && !(ref instanceof PsiReferenceExpression)) {
return;
}
final PsiElement element = file.findElementAt(context.getStartOffset());
if (psiElement().inside(PsiAnnotation.class).accepts(element)) {
return;
}
context.setDummyIdentifier(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED);
String dummyIdentifier = customizeDummyIdentifier(context, file);
if (dummyIdentifier != null) {
context.setDummyIdentifier(dummyIdentifier);
}
}
}
@Nullable
private static String customizeDummyIdentifier(@NotNull CompletionInitializationContext context, PsiFile file) {
if (context.getCompletionType() != CompletionType.BASIC) return null;
int offset = context.getStartOffset();
if (PsiTreeUtil.findElementOfClassAtOffset(file, offset - 1, PsiReferenceParameterList.class, false) != null) {
return CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED;
}
if (semicolonNeeded(context.getEditor(), file, offset)) {
return CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED + ";";
}
PsiJavaCodeReferenceElement ref = PsiTreeUtil.findElementOfClassAtOffset(file, offset, PsiJavaCodeReferenceElement.class, false);
if (ref != null && !(ref instanceof PsiReferenceExpression)) {
return null;
}
if (PsiTreeUtil.findElementOfClassAtOffset(file, offset, PsiAnnotation.class, false) != null) {
return null;
}
return CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED;
}
public static boolean semicolonNeeded(Editor editor, PsiFile file, int startOffset) {
PsiJavaCodeReferenceElement ref = PsiTreeUtil.findElementOfClassAtOffset(file, startOffset, PsiJavaCodeReferenceElement.class, false);
if (ref != null && !(ref instanceof PsiReferenceExpression)) {