diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java')
-rw-r--r-- | java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java index 8a9eca38a529..6a44f2529284 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java @@ -15,7 +15,9 @@ */ package com.intellij.refactoring.changeSignature; +import com.intellij.codeInsight.AnnotationUtil; import com.intellij.codeInsight.ExceptionUtil; +import com.intellij.codeInsight.InferredAnnotationsManager; import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil; import com.intellij.codeInspection.dataFlow.ControlFlowAnalyzer; import com.intellij.lang.StdLanguages; @@ -943,7 +945,8 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr } private static void checkContract(MultiMap<PsiElement, String> conflictDescriptions, PsiMethod method) { - if (ControlFlowAnalyzer.findContractAnnotation(method) != null) { + PsiAnnotation contract = ControlFlowAnalyzer.findContractAnnotation(method); + if (contract != null && !AnnotationUtil.isInferredAnnotation(contract)) { conflictDescriptions.putValue(method, "@Contract annotation will have to be changed manually"); } } |