From 9a38607df9a13ae25ebbb63365429b2faef79db4 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 16 May 2017 15:59:55 +0200 Subject: [PATCH] cleanup (IDEA-CR-20904) --- .../nullable/NullableStuffInspectionBase.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java index c54e265f197f..d482d56fa3af 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java @@ -208,12 +208,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo PsiExpression returnValue = statement.getReturnValue(); if (returnValue == null) return; - PsiElement element = PsiTreeUtil.getParentOfType(statement, PsiMethod.class, PsiLambdaExpression.class); - if (element == null) return; - - PsiType returnType = element instanceof PsiMethod ? ((PsiMethod)element).getReturnType() : LambdaUtil.getFunctionalInterfaceReturnType((PsiFunctionalExpression)element); - - checkCollectionNullityOnAssignment(statement.getReturnValue(), returnType, returnValue); + checkCollectionNullityOnAssignment(statement.getReturnValue(), PsiTypesUtil.getMethodReturnType(statement), returnValue); } @Override