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

Fix if/else to switch to handle null scenarios #1726

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Fix if/else to switch to handle null scenarios #1726

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
53 changes: 47 additions & 6 deletions ...t.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/SwitchFixCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.IfStatement;
import org.eclipse.jdt.core.dom.InfixExpression;
import org.eclipse.jdt.core.dom.InfixExpression.Operator;
import org.eclipse.jdt.core.dom.MethodInvocation;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.Statement;
import org.eclipse.jdt.core.dom.SuperFieldAccess;
import org.eclipse.jdt.core.dom.SwitchCase;
Expand All @@ -62,6 +64,7 @@
import org.eclipse.jdt.internal.corext.refactoring.nls.NLSElement;
import org.eclipse.jdt.internal.corext.refactoring.nls.NLSLine;
import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;

import org.eclipse.jdt.ui.cleanup.ICleanUpFix;

Expand Down Expand Up @@ -432,29 +435,54 @@ public SourceRange computeSourceRange(final ASTNode nodeWithComment) {
});

SwitchStatement switchStatement= ast.newSwitchStatement();
switchStatement.setExpression(ASTNodes.createMoveTarget(rewrite, switchExpression));
ASTNode newStatement= switchStatement;

CompilationUnit unit= cuRewrite.getRoot();
ICompilationUnit cu= (ICompilationUnit)unit.getJavaElement();
ITypeBinding switchTypeBinding= switchExpression.resolveTypeBinding();
boolean isEnum= switchTypeBinding != null && switchTypeBinding.isEnum();

if (cu != null && !JavaModelUtil.is21OrHigher(cu.getJavaProject())) {
if (switchTypeBinding != null && !switchTypeBinding.isPrimitive()) {
IfStatement newIfStatement= ast.newIfStatement();
InfixExpression newInfixExpression= ast.newInfixExpression();
newInfixExpression.setOperator(Operator.NOT_EQUALS);
newInfixExpression.setLeftOperand((Expression) rewrite.createCopyTarget(switchExpression));
newInfixExpression.setRightOperand(ast.newNullLiteral());
newIfStatement.setExpression(newInfixExpression);
Block newBlock= ast.newBlock();
newIfStatement.setThenStatement(newBlock);
newBlock.statements().add(switchStatement);
newStatement= newIfStatement;
}
}

switchStatement.setExpression((Expression) rewrite.createCopyTarget(switchExpression));

for (SwitchCaseSection aCase : cases) {
addCaseWithStatements(rewrite, ast, switchStatement, aCase.literalExpressions, aCase.tagList, aCase.statements);
addCaseWithStatements(rewrite, ast, switchStatement, aCase.literalExpressions, aCase.tagList, aCase.statements, isEnum);
}

if (remainingStatement != null) {
remainingStatement.setProperty(UNTOUCH_COMMENT_PROPERTY, Boolean.TRUE);
addCaseWithStatements(rewrite, ast, switchStatement, null, null, ASTNodes.asList(remainingStatement));
addCaseWithStatements(rewrite, ast, switchStatement, null, null, ASTNodes.asList(remainingStatement), isEnum);
if (newStatement instanceof IfStatement ifStatement) {
ifStatement.setElseStatement((Statement) rewrite.createCopyTarget(remainingStatement));
}
} else {
addCaseWithStatements(rewrite, ast, switchStatement, null, null, Collections.emptyList());
addCaseWithStatements(rewrite, ast, switchStatement, null, null, Collections.emptyList(), isEnum);
}

for (int i= 0; i < ifStatements.size() - 1; i++) {
ASTNodes.removeButKeepComment(rewrite, ifStatements.get(i), group);
}

ASTNodes.replaceButKeepComment(rewrite, ifStatements.get(ifStatements.size() - 1), switchStatement, group);
ASTNodes.replaceButKeepComment(rewrite, ifStatements.get(ifStatements.size() - 1), newStatement, group);
}

private void addCaseWithStatements(final ASTRewrite rewrite, final AST ast, final SwitchStatement switchStatement,
final List<Expression> caseValuesOrNullForDefault, final List<Boolean> tagList,
final List<Statement> innerStatements) {
final List<Statement> innerStatements, boolean isEnum) {
List<Statement> switchStatements= switchStatement.statements();
boolean needBlock= checkForLocalDeclarations(innerStatements);
Boolean hasTag= false;
Expand All @@ -466,6 +494,9 @@ private void addCaseWithStatements(final ASTRewrite rewrite, final AST ast, fina
String spaceBefore= getCoreOption(cu.getJavaProject(), DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_BEFORE_COLON_IN_CASE, false) ? " " : ""; //$NON-NLS-1$ //$NON-NLS-2$
for (int i= 0; i < caseValuesOrNullForDefault.size(); ++i) {
Expression caseValue= caseValuesOrNullForDefault.get(i);
if (isEnum && caseValue instanceof QualifiedName qName) {
caseValue= qName.getName();
}
hasTag= tagList.get(i);
if (hasTag) {
try {
Expand All @@ -487,6 +518,16 @@ private void addCaseWithStatements(final ASTRewrite rewrite, final AST ast, fina
}
}
} else {
CompilationUnit unit= (CompilationUnit)switchExpression.getRoot();
ICompilationUnit cu= (ICompilationUnit)unit.getJavaElement();
if (cu != null && JavaModelUtil.is21OrHigher(cu.getJavaProject())) {
ITypeBinding switchTypeBinding= switchExpression.resolveTypeBinding();
if (switchTypeBinding != null && !switchTypeBinding.isPrimitive()) {
SwitchCase newSwitchCase= ast.newSwitchCase();
newSwitchCase.expressions().add(ast.newNullLiteral());
switchStatements.add(newSwitchCase);
}
}
switchStatements.add(ast.newSwitchCase());
}

Expand Down
112 changes: 61 additions & 51 deletions org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest12.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,36 +1131,41 @@ public class E {

public void bug1(String i1) {
int i = 0;
switch (i1) {
case E.VALUE0 : {
int integer1 = 0;
i = integer1;
break;
}
case E.VALUE1 : {
char integer1 = 'a';
i = integer1;
break;
}
case E.VALUE2 : {
char integer1 = 'b';
i = integer1;
break;
}
case "5" : //$NON-NLS-1$
case "five" :
case "another string" : //$NON-NLS-1$
{
char integer1 = 'c';
i = integer1;
break;
}
default :
if (computeit(i1) || i1.equals(E.VALUE3)) {
//
//
if (i1 != null) {
switch (i1) {
case E.VALUE0 : {
int integer1 = 0;
i = integer1;
break;
}
case E.VALUE1 : {
char integer1 = 'a';
i = integer1;
break;
}
break;
case E.VALUE2 : {
char integer1 = 'b';
i = integer1;
break;
}
case "5" : //$NON-NLS-1$
case "five" :
case "another string" : //$NON-NLS-1$
{
char integer1 = 'c';
i = integer1;
break;
}
default :
if (computeit(i1) || i1.equals(E.VALUE3)) {
//
//
}
break;
}
} else if (computeit(i1) || i1.equals(E.VALUE3)) {
//
//
}
}

Expand Down Expand Up @@ -1221,29 +1226,34 @@ public enum MYENUM { VALUE0,VALUE1,VALUE2,VALUE3,VALUE4,VALUE5}

public void bug1(MYENUM i1) {
int i = 0;
switch (i1) {
case MYENUM.VALUE0 : {
int integer1 = 0;
i = integer1;
break;
}
case MYENUM.VALUE1 : {
char integer1 = 'a';
i = integer1;
break;
}
case MYENUM.VALUE2 : {
char integer1 = 'b';
i = integer1;
break;
}
default :
if (computeit(i1) || i1 == MYENUM.VALUE3) {
//
//
if (i1 != null) {
switch (i1) {
case VALUE0 : {
int integer1 = 0;
i = integer1;
break;
}
break;
}
case VALUE1 : {
char integer1 = 'a';
i = integer1;
break;
}
case VALUE2 : {
char integer1 = 'b';
i = integer1;
break;
}
default :
if (computeit(i1) || i1 == MYENUM.VALUE3) {
//
//
}
break;
}
} else if (computeit(i1) || i1 == MYENUM.VALUE3) {
//
//
}
}

private boolean computeit(MYENUM i) {
Expand Down
Loading