Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Omit some unnecessary break statements when translating to -> switches #4516

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Omit some unnecessary break statements when translating to -> switches #4516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
}
Expand Down
38 changes: 36 additions & 2 deletions ...rc/test/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ public void switchByEnumCard2_removesRedundantBreaks_error() {
" // Post break comment",
" case DIAMOND -> {",
" // Diamond break comment",
" break;",
" }",
" case SPADE, CLUB -> System.out.println(\"everything else\");",
" }",
Expand Down Expand Up @@ -1385,7 +1384,6 @@ public void switchByEnum_surroundingBracesCannotRemove_error() {
" switch(side) {",
" case OBVERSE -> {",
" // The quick brown fox, jumps over the lazy dog, etc.",
" break;",
" }",
" default -> ",
" throw new RuntimeException(\"Invalid type.\");",
Expand Down Expand Up @@ -3623,4 +3621,40 @@ public void i4222() {
.setArgs("-XepOpt:StatementSwitchToExpressionSwitch:EnableDirectConversion=true")
.doTest(BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH);
}

@Test
public void unnecessaryBreaks() {
assumeTrue(RuntimeVersion.isAtLeast14());
refactoringHelper
.addInputLines(
"Test.java",
"public class Test {",
" public static void main(String[] args) {",
" switch (args.length) {",
" case 0:",
" System.out.println(0);",
" break;",
" default:",
" // hello",
" // world",
" break;",
" }",
" }",
"}")
.addOutputLines(
"Test.java",
"public class Test {",
" public static void main(String[] args) {",
" switch (args.length) {",
" case 0 -> System.out.println(0);",
" default -> {",
" // hello",
" // world",
" }",
" }",
" }",
"}")
.setArgs("-XepOpt:StatementSwitchToExpressionSwitch:EnableDirectConversion=true")
.doTest(BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH);
}
}
Loading