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

don't substitute methods while choosing closure descriptor to use in completion

Browse Source
This commit is contained in:
Max Medvedev
2012-09-28 18:23:24 +03:00
parent 1da196fc84
commit a6816dd0ef
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
}, ResolveState.initial());
for (ClosureDescriptor descriptor : descriptors) {
if (descriptor.isMethodApplicable(method, substitutor, (GrReferenceExpression)parent)) {
if (descriptor.isMethodApplicable(method, (GrReferenceExpression)parent)) {
if (runClosureTemplate(context, document, offset, descriptor, substitutor, method)) {
return true;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/closureParameters/ClosureDescriptor.java
+4 -2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.plugins.groovy.lang.completion.closureParameters;
import com.intellij.psi.*;
import com.intellij.psi.impl.compiled.ClsMethodImpl;
import com.intellij.psi.impl.light.LightElement;
import com.intellij.psi.util.MethodSignature;
import com.intellij.psi.util.MethodSignatureUtil;
@@ -61,7 +62,7 @@ public class ClosureDescriptor extends LightElement implements PsiElement {
this.myMethod = method;
}
public boolean isMethodApplicable(PsiMethod method, PsiSubstitutor substitutor, GroovyPsiElement place) {
public boolean isMethodApplicable(PsiMethod method, GroovyPsiElement place) {
String name = String.valueOf(myMethod.get("name"));
if (name == null || !name.equals(method.getName())) return false;
@@ -84,9 +85,10 @@ public class ClosureDescriptor extends LightElement implements PsiElement {
}
final boolean isConstructor = Boolean.TRUE.equals(myMethod.get("constructor"));
final MethodSignature signature = MethodSignatureUtil
.createMethodSignature(name, types.toArray(new PsiType[types.size()]), method.getTypeParameters(), substitutor, isConstructor);
.createMethodSignature(name, types.toArray(new PsiType[types.size()]), method.getTypeParameters(), PsiSubstitutor.EMPTY, isConstructor);
final GrClosureSignature closureSignature = GrClosureSignatureUtil.createSignature(signature);
if (method instanceof ClsMethodImpl) method = ((ClsMethodImpl)method).getSourceMirrorMethod();
final PsiParameter[] parameters = method.getParameterList().getParameters();
final PsiType[] typeArray = new PsiType[parameters.length];
ContainerUtil.map(parameters, new Function<PsiParameter, PsiType>() {