-
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
Support sources located in an unnamed package #64
Merged
timtebeek
merged 1 commit into
openrewrite:main
from
Stephan202:bugfix/unnamed-packages
Jan 10, 2024
Merged
Changes from all commits
Commits
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
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,29 @@ | ||
/* | ||
* 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. | ||
*/ | ||
import com.google.errorprone.refaster.annotation.AfterTemplate; | ||
import com.google.errorprone.refaster.annotation.BeforeTemplate; | ||
|
||
public class UnnamedPackage { | ||
@BeforeTemplate | ||
String before() { | ||
return "This class is located in the default package"; | ||
} | ||
|
||
@AfterTemplate | ||
String after() { | ||
return "And that doesn't cause any problems"; | ||
} | ||
} |
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,75 @@ | ||
/* | ||
* 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. | ||
*/ | ||
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 recipe created for Refaster template {@code UnnamedPackage}. | ||
*/ | ||
@SuppressWarnings("all") | ||
@NonNullApi | ||
public class UnnamedPackageRecipe extends Recipe { | ||
|
||
/** | ||
* Instantiates a new instance. | ||
*/ | ||
public UnnamedPackageRecipe() {} | ||
|
||
@Override | ||
public String getDisplayName() { | ||
return "Refaster template `UnnamedPackage`"; | ||
} | ||
|
||
@Override | ||
public String getDescription() { | ||
return "Recipe created for the following Refaster template:\n```java\npublic class UnnamedPackage {\n \n @BeforeTemplate()\n String before() {\n return \"This class is located in the default package\";\n }\n \n @AfterTemplate()\n String after() {\n return \"And that doesn\\'t cause any problems\";\n }\n}\n```\n."; | ||
} | ||
|
||
@Override | ||
public TreeVisitor<?, ExecutionContext> getVisitor() { | ||
JavaVisitor<ExecutionContext> javaVisitor = new AbstractRefasterJavaVisitor() { | ||
final JavaTemplate before = Semantics.expression(this, "before", () -> "This class is located in the default package").build(); | ||
final JavaTemplate after = Semantics.expression(this, "after", () -> "And that doesn\'t cause any problems").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()), getCursor(), ctx); | ||
} | ||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* 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. | ||
*/ | ||
import org.openrewrite.java.*; | ||
|
||
/** | ||
* OpenRewrite `message` template created for {@code UnnamedPackage$1}. | ||
*/ | ||
@SuppressWarnings("all") | ||
public class UnnamedPackage$1_message { | ||
/** | ||
* Instantiates a new instance. | ||
*/ | ||
public UnnamedPackage$1_message() {} | ||
|
||
/** | ||
* Get the {@code JavaTemplate.Builder} to match or replace. | ||
* @return the JavaTemplate builder. | ||
*/ | ||
public static JavaTemplate.Builder getTemplate() { | ||
return JavaTemplate | ||
.builder("\"This class is located in the default package\""); | ||
} | ||
} |
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,25 @@ | ||
/* | ||
* 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. | ||
*/ | ||
import org.openrewrite.ExecutionContext; | ||
import org.openrewrite.java.JavaIsoVisitor; | ||
import org.openrewrite.java.JavaTemplate; | ||
import org.openrewrite.java.template.Semantics; | ||
|
||
public class UnnamedPackage { | ||
JavaIsoVisitor visitor = new JavaIsoVisitor<ExecutionContext>() { | ||
JavaTemplate.Builder message = Semantics.expression(this, "message", () -> "This class is located in the default package"); | ||
}; | ||
} |
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.
Deduplicating
classDecl.sym.packge()
andclassDecl.sym.fullname.toString()
at the top of this method would yield an NPE, unless more things are refactored. But that would likely change the indentation of most of the code in this method, which would make the PR way harder to review. Seems better to refactor that separately (if at all).