IDEA-64291 groovy parsing get stuck and is wrong

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClosureSignatureImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClosureSignatureImpl.java
index 8adc70ef8db28b5a26c765e5a85358ab1374c16a..39cdd09bafe5ebcce4713dfa8dbe9ce634c1ae6e 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClosureSignatureImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrClosureSignatureImpl.java
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClosureParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClosureSignature;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClosureParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClosureSignature;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;

-import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;

 
 /**
  * @author Maxim.Medvedev
 
 /**
  * @author Maxim.Medvedev


@@ -31,7 +30,7 @@ public class GrClosureSignatureImpl implements GrClosureSignature {
   private final boolean myIsVarargs;
   @Nullable private final PsiType myReturnType;
   @NotNull private final GrClosureParameter[] myParameters;
   private final boolean myIsVarargs;
   @Nullable private final PsiType myReturnType;
   @NotNull private final GrClosureParameter[] myParameters;

-  @NotNull private PsiSubstitutor mySubstitutor;
+  @NotNull private final PsiSubstitutor mySubstitutor;

 
   public GrClosureSignatureImpl(@NotNull PsiParameter[] parameters, @Nullable PsiType returnType, @NotNull PsiSubstitutor substitutor) {
     myReturnType = substitutor.substitute(returnType);
 
   public GrClosureSignatureImpl(@NotNull PsiParameter[] parameters, @Nullable PsiType returnType, @NotNull PsiSubstitutor substitutor) {
     myReturnType = substitutor.substitute(returnType);


@@ -41,7 +40,7 @@ public class GrClosureSignatureImpl implements GrClosureSignature {
       myParameters[i] = new GrClosureParameterImpl(parameters[i], substitutor);
     }
     if (length > 0) {
       myParameters[i] = new GrClosureParameterImpl(parameters[i], substitutor);
     }
     if (length > 0) {

-      myIsVarargs = /*parameters[length - 1].isVarArgs() ||*/ myParameters[length - 1].getType() instanceof PsiArrayType;
+      myIsVarargs = myParameters[length - 1].getType() instanceof PsiArrayType;

     }
     else {
       myIsVarargs = false;
     }
     else {
       myIsVarargs = false;


@@ -57,6 +56,7 @@ public class GrClosureSignatureImpl implements GrClosureSignature {
     myParameters = params;
     myReturnType = returnType;
     myIsVarargs = isVarArgs;
     myParameters = params;
     myReturnType = returnType;
     myIsVarargs = isVarArgs;

+    mySubstitutor = PsiSubstitutor.EMPTY;

   }
 
 
   }