Omit some unnecessary break statements when translating to -> switches

PiperOrigin-RevId: 658563247
google · Aug 1, 2024 · f161375 · f161375
1 parent fe07236
commit f161375
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 938 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AutoValueBoxedValues.java b/core/src/main/java/com/google/errorprone/bugpatterns/AutoValueBoxedValues.java
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java b/core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java
@@ -36,7 +36,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Streams;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.ErrorProneFlags;
@@ -585,7 +584,7 @@ private static SuggestedFix convertDirectlyToExpressionSwitch(
                     groupedCaseCommentsAccumulator.length() == 0
                         ? null
                         : groupedCaseCommentsAccumulator.toString(),
-                    transformedBlockSource.isEmpty() ? null : transformedBlockSource,
+                    transformedBlockSource.isEmpty() ? null : transformedBlockSource.trim(),
                     commentsBeforeRemovedBreak.orElse(null),
                     commentsAfterCaseOptional.orElse(null));
       }
@@ -902,7 +901,7 @@ && getStatements(caseTree).size() > filteredStatements.size()) {
           state
               .getSourceCode()
               .subSequence(
-                  state.getEndPosition(Iterables.getLast(filteredStatements)),
+                  state.getEndPosition(getLast(filteredStatements)),
                   getStartPosition(getStatements(caseTree).get(getStatements(caseTree).size() - 1)))
               .toString()
               .trim();
@@ -952,11 +951,10 @@ private static String transformBlock(
 
     StringBuilder transformedBlockBuilder = new StringBuilder();
     int codeBlockStart = extractLhsComments(caseTree, state, transformedBlockBuilder);
-    int codeBlockEnd =
-        filteredStatements.isEmpty()
-            ? getBlockEnd(state, caseTree)
-            : state.getEndPosition(Streams.findLast(filteredStatements.stream()).get());
-    transformedBlockBuilder.append(state.getSourceCode(), codeBlockStart, codeBlockEnd);
+    if (!filteredStatements.isEmpty()) {
+      int codeBlockEnd = state.getEndPosition(getLast(filteredStatements));
+      transformedBlockBuilder.append(state.getSourceCode(), codeBlockStart, codeBlockEnd);
+    }
 
     return transformedBlockBuilder.toString();
   }

diff --git a/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java b/core/src/main/java/com/google/errorprone/scanner/BuiltInCheckerSuppliers.java
@@ -42,7 +42,6 @@
 import com.google.errorprone.bugpatterns.AsyncCallableReturnsNull;
 import com.google.errorprone.bugpatterns.AsyncFunctionReturnsNull;
 import com.google.errorprone.bugpatterns.AttemptedNegativeZero;
-import com.google.errorprone.bugpatterns.AutoValueBoxedValues;
 import com.google.errorprone.bugpatterns.AutoValueBuilderDefaultsInConstructor;
 import com.google.errorprone.bugpatterns.AutoValueFinalMethods;
 import com.google.errorprone.bugpatterns.AutoValueImmutableFields;
@@ -1129,7 +1128,6 @@ public static ScannerSupplier warningChecks() {
           AssertFalse.class,
           AssistedInjectAndInjectOnConstructors.class,
           AutoFactoryAtInject.class,
-          AutoValueBoxedValues.class,
           AvoidObjectArrays.class,
           BanClassLoader.class,
           BanSerializableRead.class,