diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java index 409a8a99fc5f..d927d8cb78a4 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java @@ -1673,7 +1673,8 @@ class ControlFlowAnalyzer extends JavaElementVisitor { addInstruction(expression.resolve() instanceof PsiField ? new FieldReferenceInstruction(expression, null) : new PopInstruction()); } - addInstruction(new PushInstruction(getExpressionDfaValue(expression), expression, PsiUtil.isAccessedForReading(expression))); + boolean referenceRead = PsiUtil.isAccessedForReading(expression) && !PsiUtil.isAccessedForWriting(expression); + addInstruction(new PushInstruction(getExpressionDfaValue(expression), expression, referenceRead)); finishElement(expression); } diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ReportConstantReferences_NotInComplexAssignment.java b/java/java-tests/testData/inspection/dataFlow/fixture/ReportConstantReferences_NotInComplexAssignment.java new file mode 100644 index 000000000000..a13f0f1b5d60 --- /dev/null +++ b/java/java-tests/testData/inspection/dataFlow/fixture/ReportConstantReferences_NotInComplexAssignment.java @@ -0,0 +1,6 @@ +class Test { + void foo() { + int x = 42; + x += 100; + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java index 32fc5d688f6c..6de4bef6febd 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java @@ -175,6 +175,11 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase { myFixture.launchAction(myFixture.findSingleIntention("Replace with 'FOO'")); myFixture.checkResultByFile(getTestName(false) + "_after.java"); } + public void testReportConstantReferences_NotInComplexAssignment() { + myFixture.addClass("package foo; public enum MyEnum { FOO }"); + doTestReplaceConstantReferences(); + assertEmpty(myFixture.filterAvailableIntentions("Replace with")); + } public void testReportConstantReferences_Switch() { doTestReplaceConstantReferences(); } public void testCheckFieldInitializers() {