Setting endPos correctly when deleting the statement

uber · Dec 2, 2021 · 90e2577 · 90e2577
1 parent 976d7cc
commit 90e2577
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/java/piranha/src/main/java/com/uber/piranha/XPFlagCleaner.java b/java/piranha/src/main/java/com/uber/piranha/XPFlagCleaner.java
@@ -697,9 +697,9 @@ private Description updateCode(
       if (fixBuilder.isEmpty()) {
         String replacementString = v.equals(Value.TRUE) ? TRUE : FALSE;
         fixBuilder = SuggestedFix.builder().replace(expr, replacementString);
+        endPos = state.getEndPosition(expr);
       }
       decrementAllSymbolUsages(expr, state, fixBuilder);
-      endPos = state.getEndPosition(expr);
       return buildDescription(tree).addFix(fixBuilder.build()).build();
     }
     return Description.NO_MATCH;
@@ -727,6 +727,7 @@ private SuggestedFix.Builder handleSpecificAPIPatterns(VisitorState state) {
     ExpressionStatementTree stmt =
         ASTHelpers.findEnclosingNode(state.getPath(), ExpressionStatementTree.class);
     if (stmt != null && MOCKITO_UNNECESSARY_MOCKING_PATTERN.matches(stmt.getExpression(), state)) {
+      endPos = state.getEndPosition(stmt);
       return SuggestedFix.builder().delete(stmt);
     }
     return SuggestedFix.builder();