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

turn off contract inference for overrideable methods: fix logic

Browse Source
This commit is contained in:
peter
2014-07-22 12:48:51 +02:00
parent 1bf7333c32
commit 2e780d7a47
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/InferredAnnotationsManagerImpl.java
+7 -5
View File
@@ -40,7 +40,7 @@ public class InferredAnnotationsManagerImpl extends InferredAnnotationsManager {
return fromBytecode;
}
if (listOwner instanceof PsiMethod && ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN) && !PsiUtil.canBeOverriden((PsiMethod)listOwner)) {
if (ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN) && canHaveContract(listOwner)) {
List<MethodContract> contracts = ContractInference.inferContracts((PsiMethod)listOwner);
if (!contracts.isEmpty()) {
return ProjectBytecodeAnalysis.getInstance(listOwner.getProject()).createContractAnnotation("\"" + StringUtil.join(contracts, "; ") + "\"");
@@ -50,20 +50,22 @@ public class InferredAnnotationsManagerImpl extends InferredAnnotationsManager {
return null;
}
private static boolean canHaveContract(PsiModifierListOwner listOwner) {
return listOwner instanceof PsiMethod && !PsiUtil.canBeOverriden((PsiMethod)listOwner);
}
@NotNull
@Override
public PsiAnnotation[] findInferredAnnotations(@NotNull PsiModifierListOwner listOwner) {
List<PsiAnnotation> result = ContainerUtil.newArrayList();
PsiAnnotation[] fromBytecode = ProjectBytecodeAnalysis.getInstance(listOwner.getProject()).findInferredAnnotations(listOwner);
for (PsiAnnotation annotation : fromBytecode) {
if (!ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotation.getQualifiedName()) ||
!(listOwner instanceof PsiMethod) ||
!PsiUtil.canBeOverriden((PsiMethod)listOwner)) {
if (!ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotation.getQualifiedName()) || canHaveContract(listOwner)) {
result.add(annotation);
}
}
if (listOwner instanceof PsiMethod && !PsiUtil.canBeOverriden((PsiMethod)listOwner)) {
if (canHaveContract(listOwner)) {
List<MethodContract> contracts = ContractInference.inferContracts((PsiMethod)listOwner);
if (!contracts.isEmpty()) {
result.add(ProjectBytecodeAnalysis.getInstance(listOwner.getProject())