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

fix PIEAE in groovy class name completion after new

Browse Source
This commit is contained in:
peter
2010-12-13 16:42:37 +03:00
parent 4f5de93560
commit e1fcc3156a
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
+1 -1
View File
@@ -259,7 +259,7 @@ public class GroovySmartCompletionContributor extends CompletionContributor {
final LookupItem item = PsiTypeLookupItem.createLookupItem(JavaCompletionUtil.eliminateWildcards(type), place);
JavaCompletionUtil.setShowFQN(item);
item.setInsertHandler(new AfterNewClassInsertHandler((PsiClassType)type, place, true));
item.setInsertHandler(new AfterNewClassInsertHandler((PsiClassType)type, true));
return item;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/AfterNewClassInsertHandler.java
+13 -10
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.Condition;
import com.intellij.psi.*;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.completion.GroovyCompletionUtil;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
@@ -35,12 +36,10 @@ import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
*/
public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiClassType>> {
private final PsiClassType myClassType;
private final PsiElement myPlace;
private final boolean myTriggerFeature;
public AfterNewClassInsertHandler(PsiClassType classType, PsiElement place, boolean triggerFeature) {
public AfterNewClassInsertHandler(PsiClassType classType, boolean triggerFeature) {
myClassType = classType;
myPlace = place;
myTriggerFeature = triggerFeature;
}
@@ -50,15 +49,12 @@ public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiC
if (psiClass == null || !psiClass.isValid()) {
return;
}
PsiElement place = myPlace;
if (!(place instanceof GroovyPsiElement)) {
place = myPlace.getContainingFile();
}
PsiMethod[] constructors = ResolveUtil.getAllClassConstructors(psiClass, (GroovyPsiElement)place, resolveResult.getSubstitutor());
final GroovyPsiElement place = obtainPlace(context);
PsiMethod[] constructors = ResolveUtil.getAllClassConstructors(psiClass, place, resolveResult.getSubstitutor());
final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(psiClass.getProject()).getResolveHelper();
boolean hasParams = ContainerUtil.or(constructors, new Condition<PsiMethod>() {
public boolean value(PsiMethod psiMethod) {
if (!resolveHelper.isAccessible(psiMethod, myPlace, null)) {
if (!resolveHelper.isAccessible(psiMethod, place, null)) {
return false;
}
@@ -80,5 +76,12 @@ public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiC
if (hasParams) AutoPopupController.getInstance(constructors[0].getProject()).autoPopupParameterInfo(context.getEditor(), null);
}
private static GroovyPsiElement obtainPlace(InsertionContext context) {
PsiElement place = context.getFile().findElementAt(context.getStartOffset());
assert place != null;
if (place instanceof GroovyPsiElement) {
return (GroovyPsiElement)place;
}
return (GroovyFileBase)place.getContainingFile();
}
}