MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 06:11:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

don't qualify magic method calls unless it's really needed. qualify instance magic methods with 'this'

Browse Source
This commit is contained in:
peter
2010-08-31 19:29:32 +01:00
parent a0bae733e4
commit 915cf66ef3
5 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java
+13 -5
View File
@@ -103,7 +103,7 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
final int startOffset = context.getStartOffset();
final OffsetKey refStart = context.trackOffset(startOffset, true);
if (SmartCompletionDecorator.hasUnboundTypeParams(method)) {
if (shouldInsertTypeParameters(context)) {
qualifyMethodCall(file, startOffset, document);
insertExplicitTypeParameters(context, refStart);
}
@@ -133,6 +133,17 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
}
private boolean shouldInsertTypeParameters(InsertionContext context) {
final PsiElement leaf = context.getFile().findElementAt(context.getStartOffset());
if (PsiTreeUtil.getParentOfType(leaf, PsiExpressionList.class, true, PsiCodeBlock.class, PsiModifierListOwner.class) == null) {
if (PsiTreeUtil.getParentOfType(leaf, PsiConditionalExpression.class, true, PsiCodeBlock.class, PsiModifierListOwner.class) == null) {
return false;
}
}
return SmartCompletionDecorator.hasUnboundTypeParams(getObject());
}
private boolean insertExplicitTypeParameters(InsertionContext context, OffsetKey refStart) {
context.commitDocument();
@@ -169,10 +180,7 @@ public class JavaMethodCallElement extends LookupItem<PsiMethod> implements Type
final PsiMethod method = getObject();
if (!method.hasModifierProperty(PsiModifier.STATIC)) {
document.insertString(startOffset, "this.");
if (method.getManager().areElementsEquivalent(myContainingClass, PsiTreeUtil.findElementOfClassAtOffset(file, startOffset, PsiClass.class, false))) {
return;
}
return;
}
document.insertString(startOffset, ".");