From 5bd82ea06e6518b3e90ca2bf9c080bfe26ac7a2f Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 21 Mar 2011 19:47:10 +0100 Subject: [PATCH] check tuple component type for null (EA-26251) --- .../jetbrains/plugins/groovy/gpp/GppTypeConverter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java index 59418f7e2466..71e8f037023c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java @@ -48,9 +48,11 @@ public class GppTypeConverter extends GrTypeConverter { final PsiType expectedComponent = PsiUtil.extractIterableTypeParameter(lType, false); if (expectedComponent != null && - isMethodCallConversion(context) && TypesUtil.isAssignable(expectedComponent, tupleType.getParameters()[0], context) && - hasDefaultConstructor(lType)) { - return true; + isMethodCallConversion(context)) { + PsiType tupleComponent = tupleType.getParameters()[0]; + if (tupleComponent != null && TypesUtil.isAssignable(expectedComponent, tupleComponent, context) && hasDefaultConstructor(lType)) { + return true; + } } if (lType instanceof PsiClassType && hasTypedContext(context)) {