-
Notifications
You must be signed in to change notification settings - Fork 7
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
159
src/test/resources/refaster/SimplifyTernaryRecipes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 runningUnnecessaryParenthesesVisitor
to cause any issues when they do occur.