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

check tuple component type for null (EA-26251)

Browse Source
This commit is contained in:
peter
2011-03-21 20:29:08 +01:00
parent 226ff9bb7f
commit 5bd82ea06e
1 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/gpp/GppTypeConverter.java
+5 -3
View File
@@ -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)) {