Skip to content

Commit 895431f

Browse files
Apply Gitar review fixes
1 parent 16fe06f commit 895431f

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

java-checks/src/main/java/org/sonar/java/checks/unused/UnusedLocalVariableCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ private static boolean isRValue(IdentifierTree tree) {
114114
return assignment.variable() != tree;
115115
}
116116
if (parent == null) {
117-
return false;
117+
return true;
118118
}
119119
Tree grandParent = parent.parent();
120120
// Note that an expression statement can't be a parenthesized expression, so we don't need to skip parentheses here
121-
return grandParent != null && !(parent.is(INCREMENT_KINDS) && grandParent.is(Tree.Kind.EXPRESSION_STATEMENT));
121+
return !(parent.is(INCREMENT_KINDS) && grandParent != null && grandParent.is(Tree.Kind.EXPRESSION_STATEMENT));
122122
}
123123

124124
private static boolean isProperLocalVariable(VariableTree variable) {

java-frontend/src/main/java/org/sonar/java/reporting/JavaQuickFix.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ public int compare(JavaTextEdit a, JavaTextEdit b) {
9393
AnalyzerMessage.TextSpan first = a.getTextSpan();
9494
AnalyzerMessage.TextSpan second = b.getTextSpan();
9595

96-
int result = first.startLine - second.startLine;
96+
int result = Integer.compare(first.startLine, second.startLine);
9797
if (result != 0) {
9898
return result;
9999
}
100-
result = first.startCharacter - second.startCharacter;
100+
result = Integer.compare(first.startCharacter, second.startCharacter);
101101
if (result != 0) {
102102
return result;
103103
}
104-
result = first.endLine - second.endLine;
104+
result = Integer.compare(first.endLine, second.endLine);
105105
if (result != 0) {
106106
return result;
107107
}

0 commit comments

Comments
 (0)