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.

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

Remove parentheses when after is a unary too #59

Merged
merged 2 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public void visitClassDef(JCTree.JCClassDecl classDecl) {
maybeRemoveImports(staticImports, recipe, entry.getValue(), descriptor.afterTemplate);

List<String> embedOptions = new ArrayList<>();
if (getType(descriptor.afterTemplate) == JCTree.JCParens.class) {
if (getType(descriptor.afterTemplate) == JCTree.JCParens.class || getType(descriptor.afterTemplate) == JCTree.JCUnary.class) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this matches slightly too wide; in practice I don't expect any of the other unary recipes to be used in after, or running UnnecessaryParenthesesVisitor to cause any issues when they do occur.

embedOptions.add("REMOVE_PARENS");
}
// TODO check if after template contains type or member references
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ void skipRecipeGeneration(String recipeName) {
"MultipleDereferences",
"ShouldAddImports",
"ShouldSupportNestedClasses",
"SimplifyTernary",
})
void nestedRecipes(String recipeName) {
Compilation compilation = compile("refaster/" + recipeName + ".java");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public J visitBinary(J.Binary elem, ExecutionContext ctx) {
after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0)),
getCursor(),
ctx,
SHORTEN_NAMES, SIMPLIFY_BOOLEANS
REMOVE_PARENS, SHORTEN_NAMES, SIMPLIFY_BOOLEANS
);
}
return super.visitBinary(elem, ctx);
Expand Down
57 changes: 57 additions & 0 deletions src/test/resources/refaster/SimplifyTernary.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright 2024 the original author or authors.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package foo;

import com.google.errorprone.refaster.annotation.AfterTemplate;
import com.google.errorprone.refaster.annotation.BeforeTemplate;
import org.openrewrite.java.template.RecipeDescriptor;

public class SimplifyTernary {

@RecipeDescriptor(
name = "Simplify ternary expressions",
description = "Simplify `expr ? true : false` to `expr`."
)
public static class SimplifyTernaryTrueFalse {

@BeforeTemplate
boolean before(boolean expr) {
return expr ? true : false;
}

@AfterTemplate
boolean after(boolean expr) {
return expr;
}
}

@RecipeDescriptor(
name = "Simplify ternary expressions",
description = "Simplify `expr ? false : true` to `!expr`."
)
public static class SimplifyTernaryFalseTrue {

@BeforeTemplate
boolean before(boolean expr) {
return expr ? false : true;
}

@AfterTemplate
boolean after(boolean expr) {
return !(expr);
}
}
}
159 changes: 159 additions & 0 deletions src/test/resources/refaster/SimplifyTernaryRecipes.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
/*
* Copyright 2024 the original author or authors.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package foo;

import org.openrewrite.ExecutionContext;
import org.openrewrite.Preconditions;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.internal.lang.NonNullApi;
import org.openrewrite.java.JavaTemplate;
import org.openrewrite.java.JavaVisitor;
import org.openrewrite.java.search.*;
import org.openrewrite.java.template.Primitive;
import org.openrewrite.java.template.Semantics;
import org.openrewrite.java.template.function.*;
import org.openrewrite.java.template.internal.AbstractRefasterJavaVisitor;
import org.openrewrite.java.tree.*;

import java.util.*;

import static org.openrewrite.java.template.internal.AbstractRefasterJavaVisitor.EmbeddingOption.*;

/**
* OpenRewrite recipes created for Refaster template {@code foo.SimplifyTernary}.
*/
@SuppressWarnings("all")
public class SimplifyTernaryRecipes extends Recipe {
/**
* Instantiates a new instance.
*/
public SimplifyTernaryRecipes() {}

@Override
public String getDisplayName() {
return "`SimplifyTernary` Refaster recipes";
}

@Override
public String getDescription() {
return "Refaster template recipes for `foo.SimplifyTernary`.";
}

@Override
public List<Recipe> getRecipeList() {
return Arrays.asList(
new SimplifyTernaryTrueFalseRecipe(),
new SimplifyTernaryFalseTrueRecipe()
);
}

/**
* OpenRewrite recipe created for Refaster template {@code SimplifyTernary.SimplifyTernaryTrueFalse}.
*/
@SuppressWarnings("all")
@NonNullApi
public static class SimplifyTernaryTrueFalseRecipe extends Recipe {

/**
* Instantiates a new instance.
*/
public SimplifyTernaryTrueFalseRecipe() {}

@Override
public String getDisplayName() {
return "Simplify ternary expressions";
}

@Override
public String getDescription() {
return "Simplify `expr ? true : false` to `expr`.";
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
JavaVisitor<ExecutionContext> javaVisitor = new AbstractRefasterJavaVisitor() {
final JavaTemplate before = Semantics.expression(this, "before", (@Primitive Boolean expr) -> expr ? true : false).build();
final JavaTemplate after = Semantics.expression(this, "after", (@Primitive Boolean expr) -> expr).build();

@Override
public J visitExpression(Expression elem, ExecutionContext ctx) {
JavaTemplate.Matcher matcher;
if ((matcher = before.matcher(getCursor())).find()) {
return embed(
after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0)),
getCursor(),
ctx,
SHORTEN_NAMES, SIMPLIFY_BOOLEANS
);
}
return super.visitExpression(elem, ctx);
}

};
return javaVisitor;
}
}

/**
* OpenRewrite recipe created for Refaster template {@code SimplifyTernary.SimplifyTernaryFalseTrue}.
*/
@SuppressWarnings("all")
@NonNullApi
public static class SimplifyTernaryFalseTrueRecipe extends Recipe {

/**
* Instantiates a new instance.
*/
public SimplifyTernaryFalseTrueRecipe() {}

@Override
public String getDisplayName() {
return "Simplify ternary expressions";
}

@Override
public String getDescription() {
return "Simplify `expr ? false : true` to `!expr`.";
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
JavaVisitor<ExecutionContext> javaVisitor = new AbstractRefasterJavaVisitor() {
final JavaTemplate before = Semantics.expression(this, "before", (@Primitive Boolean expr) -> expr ? false : true).build();
final JavaTemplate after = Semantics.expression(this, "after", (@Primitive Boolean expr) -> !(expr)).build();

@Override
public J visitExpression(Expression elem, ExecutionContext ctx) {
JavaTemplate.Matcher matcher;
if ((matcher = before.matcher(getCursor())).find()) {
return embed(
after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0)),
getCursor(),
ctx,
REMOVE_PARENS, SHORTEN_NAMES, SIMPLIFY_BOOLEANS
);
}
return super.visitExpression(elem, ctx);
}

};
return javaVisitor;
}
}

}
2 changes: 1 addition & 1 deletion src/test/resources/refaster/UseStringIsEmptyRecipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public J visitBinary(J.Binary elem, ExecutionContext ctx) {
after.apply(getCursor(), elem.getCoordinates().replace(), matcher.parameter(0)),
getCursor(),
ctx,
SHORTEN_NAMES, SIMPLIFY_BOOLEANS
REMOVE_PARENS, SHORTEN_NAMES, SIMPLIFY_BOOLEANS
);
}
return super.visitBinary(elem, ctx);
Expand Down