MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Ignore hardcoded contract if explicit nullability is specified (IDEA-232001)

Browse Source 
GitOrigin-RevId: 65a2c640cb814aa5726c2c24eb0dffbea116bcb1
This commit is contained in:
Tagir Valeev
2020-02-04 17:50:44 +07:00
committed by intellij-monorepo-bot
parent 78e368e3b2
commit 8012f18ad9
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/JavaMethodContractUtil.java
View File

@@ -1,8 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.codeInspection.dataFlow;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.DefaultInferredAnnotationProvider;
import com.intellij.codeInsight.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
@@ -55,9 +54,15 @@ public class JavaMethodContractUtil {
@NotNull
public static List<? extends MethodContract> getMethodCallContracts(@NotNull final PsiMethod method,
@Nullable PsiCallExpression call) {
List<MethodContract> contracts =
List<MethodContract> hardcoded =
HardcodedContracts.getHardcodedContracts(method, ObjectUtils.tryCast(call, PsiMethodCallExpression.class));
return !contracts.isEmpty() ? contracts : getMethodContracts(method);
if (!hardcoded.isEmpty()) {
NullabilityAnnotationInfo info = NullableNotNullManager.getInstance(method.getProject()).findEffectiveNullabilityInfo(method);
if (info == null || info.isExternal() || info.getNullability() != Nullability.NOT_NULL) {
return hardcoded;
}
}
return getMethodContracts(method);
}
/**