From: peter <peter.gromov@jetbrains.com>
Date: Fri, 12 Mar 2010 19:57:46 +0000 (+0000)
Subject: don't construct Map<X,null> type, it'll fail
X-Git-Tag: 94.548~1
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=19ecb1add7d5733db8203454f2969afe29b0adc5

don't construct Map<X,null> type, it'll fail
---

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
index 5b3e5fa90e5f..938626ec586a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
@@ -200,7 +200,7 @@ public class GrParameterImpl extends GrVariableImpl implements GrParameter {
   private static PsiType getEntryForMap(PsiType map, PsiElementFactory factory, PsiElement context) {
     PsiType key = PsiUtil.substituteTypeParameter(map, CommonClassNames.JAVA_UTIL_MAP, 0, true);
     PsiType value = PsiUtil.substituteTypeParameter(map, CommonClassNames.JAVA_UTIL_MAP, 1, true);
-    if (key != null && value != null) {
+    if (key != null && key != PsiType.NULL && value != null && value != PsiType.NULL) {
       return factory.createTypeFromText("java.util.Map.Entry<" + key.getCanonicalText() + ", " + value.getCanonicalText() + ">", context);
     }
     return null;