StatementSwitchToExpressionSwitch: to improve readability, for direct…

… conversions where the case expression has an enclosing brace, place a newline immediately after the opening brace PiperOrigin-RevId: 646478013
google · Jun 25, 2024 · a2b0ff6 · a2b0ff6
1 parent 5277c90
commit a2b0ff6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java b/core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java
@@ -568,7 +568,7 @@ private static SuggestedFix convertDirectlyToExpressionSwitch(
             || trimmedTransformedBlockSource.equals("break;")) {
           replacementCodeBuilder.append("{}");
         } else {
-          replacementCodeBuilder.append("{").append(transformedBlockSource).append("\n}");
+          replacementCodeBuilder.append("{\n").append(transformedBlockSource).append("\n}");
         }
       } else {
         // Transformed block has code
@@ -585,7 +585,7 @@ private static SuggestedFix convertDirectlyToExpressionSwitch(
           replacementCodeBuilder.append(transformedBlockSource);
         } else {
           // Use braces on the rhs
-          replacementCodeBuilder.append("{").append(transformedBlockSource).append("\n}");
+          replacementCodeBuilder.append("{\n").append(transformedBlockSource).append("\n}");
         }
       }
 

diff --git a/...rc/test/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitchTest.java b/...rc/test/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitchTest.java
@@ -101,7 +101,8 @@ public void switchByEnum_removesRedundantBreak_error() {
             " ",
             "  public void foo(Side side) { ",
             "    switch(side) {",
-            "       case OBVERSE -> { /* left comment */",
+            "       case OBVERSE -> {",
+            "          /* left comment */",
             "          /* and there is more: */",
             "          // to end of line",
             "          // Explanatory comment",