Skip to content

Commit fd5c332

Browse files
Add tests and make chained assignment consistent with rule scope
1 parent ce3a381 commit fd5c332

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎java-checks-test-sources/default/src/main/java/checks/DeadStoreCheckSample.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ IntFunction<Integer> dead_store_in_lambda_parameter() {
7676
};
7777
}
7878

79+
IntFunction<Integer> assignment_result_used_in_block_lambda() {
80+
return x -> {
81+
int y = x = x + 1; // Compliant (The assignment result is used)
82+
return y;
83+
};
84+
}
85+
7986
IntFunction<Integer> dead_store_in_expression_lambda() {
8087
return x -> x++; // Noncompliant {{Remove this useless assignment to local variable "x".}}
8188
// ^^^
@@ -104,6 +111,10 @@ IntFunction<Integer> dead_store_in_expression_lambda() {
104111

105112
IntUnaryOperator prefix_increment_result_lambda = x -> ++x;
106113
IntUnaryOperator compound_assignment_result_lambda = x -> x += 2;
114+
IntUnaryOperator assignment_result_lambda = x -> x = x + 1; // Compliant (The assignment result is used)
115+
IntUnaryOperator assignment_result_lambda2 = x -> {
116+
return x = x + 1; // Compliant (The assignment result is used)
117+
};
107118

108119
Runnable prefix_increment_field_lambda = () -> ++var;
109120
Runnable compound_assignment_field_lambda = () -> var += 2;

‎java-checks/src/main/java/org/sonar/java/checks/DeadStoreCheck.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private void handleAssignment(Set<Symbol> out, Set<Tree> assignmentLHS, Assignme
158158
Symbol symbol = ((IdentifierTree) lhs).symbol();
159159
if (symbol.isLocalVariable()
160160
&& !out.contains(symbol)
161-
&& (element.is(Tree.Kind.ASSIGNMENT) || isExpressionValueDiscarded(element))
161+
&& isExpressionValueDiscarded(element)
162162
&& !UNRESOLVED_IDENTIFIERS_VISITOR.isUnresolved(symbol.name())) {
163163
createIssue(element.operatorToken(), element.expression(), symbol);
164164
}

0 commit comments

Comments
 (0)