MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

OptionalUtil#getMapTypeArgument: check nulls; remove 0-arg check

Browse Source
This commit is contained in:
Tagir Valeev
2016-11-11 12:02:36 +07:00
parent 7e574d661c
commit 9fe8c96b78
8 changed files with 98 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/util/OptionalUtil.java
+8 -5
View File
@@ -141,11 +141,14 @@ public class OptionalUtil {
@NotNull
public static String getMapTypeArgument(PsiExpression expression, PsiType type) {
if (!(type instanceof PsiClassType)) return "";
if (((PsiClassType)type).getParameterCount() == 0) {
PsiExpression copy =
JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(expression.getText(), expression);
PsiType exprType = copy.getType();
if (exprType != null && !LambdaUtil.notInferredType(exprType) && TypeConversionUtil.isAssignable(type, exprType)) return "";
PsiExpression copy =
JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(expression.getText(), expression);
PsiType exprType = copy.getType();
if (exprType != null &&
!exprType.equals(PsiType.NULL) &&
!LambdaUtil.notInferredType(exprType) &&
TypeConversionUtil.isAssignable(type, exprType)) {
return "";
}
return "<" + type.getCanonicalText() + ">";
}