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: fix PIEAE when completing a constructor call invalidates the class being completed

Browse Source 
GitOrigin-RevId: bf6a03e359482f777e63e38383ecc4160cca82ec
This commit is contained in:
Peter Gromov
2020-09-02 16:19:10 +00:00
committed by intellij-monorepo-bot
parent 330669bb22
commit b65a8a3a35
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
+7 -3
View File
@@ -52,6 +52,7 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
PsiJavaCodeReferenceElement ref = position != null && position.getParent() instanceof PsiJavaCodeReferenceElement ?
(PsiJavaCodeReferenceElement) position.getParent() : null;
PsiClass psiClass = item.getObject();
SmartPsiElementPointer<PsiClass> classPointer = SmartPointerManager.createPointer(psiClass);
final Project project = context.getProject();
final Editor editor = context.getEditor();
@@ -90,18 +91,21 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
refEnd = context.trackOffset(context.getTailOffset(), false);
context.commitDocument();
psiClass = classPointer.dereference();
if (item.getUserData(JavaChainLookupElement.CHAIN_QUALIFIER) == null &&
shouldInsertParentheses(file.findElementAt(context.getTailOffset() - 1))) {
if (context.getCompletionChar() == Lookup.REPLACE_SELECT_CHAR) {
overwriteTopmostReference(context);
context.commitDocument();
}
if (ConstructorInsertHandler.insertParentheses(context, item, psiClass, false)) {
if (psiClass != null && ConstructorInsertHandler.insertParentheses(context, item, psiClass, false)) {
fillTypeArgs |= psiClass.hasTypeParameters() && PsiUtil.getLanguageLevel(file).isAtLeast(LanguageLevel.JDK_1_5);
}
}
else if (insertingAnnotation(context, item)) {
if (shouldHaveAnnotationParameters(psiClass)) {
if (psiClass != null && shouldHaveAnnotationParameters(psiClass)) {
JavaCompletionUtil.insertParentheses(context, item, false, true);
}
if (context.getCompletionChar() == Lookup.NORMAL_SELECT_CHAR || context.getCompletionChar() == Lookup.COMPLETE_STATEMENT_SELECT_CHAR) {
@@ -117,7 +121,7 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
JavaCompletionUtil.promptTypeArgs(context, context.getOffset(refEnd));
}
else if (context.getCompletionChar() == Lookup.COMPLETE_STATEMENT_SELECT_CHAR &&
psiClass.getTypeParameters().length == 1 &&
psiClass != null && psiClass.getTypeParameters().length == 1 &&
PsiUtil.getLanguageLevel(file).isAtLeast(LanguageLevel.JDK_1_5)) {
wrapFollowingTypeInGenerics(context, context.getOffset(refEnd));
}
java/java-tests/testData/codeInsight/completion/normal/NoExceptionsWhenCompletingInapplicableClassNameAfterNew.java
+7
View File
@@ -0,0 +1,7 @@
class Cx {
Another F = new C<caret>Another(
f -> ((String)f).stream().anyMatch(c -> c.m(f) != null));
}
class Another {}
java/java-tests/testData/codeInsight/completion/normal/NoExceptionsWhenCompletingInapplicableClassNameAfterNew_after.java
+7
View File
@@ -0,0 +1,7 @@
class Cx {
Another F = new Cx()<caret>Another(
f -> ((String)f).stream().anyMatch(c -> c.m(f) != null));
}
class Another {}
java/java-tests/testSrc/com/intellij/java/codeInsight/completion/NormalCompletionTest.groovy
+2
View File
@@ -2216,4 +2216,6 @@ class Abc {
assert !lookup
}.assertTiming()
}
void testNoExceptionsWhenCompletingInapplicableClassNameAfterNew() { doTest('\n') }
}