Skip to content

Commit

Permalink
Bring language-parser-builder in shape again
Browse files Browse the repository at this point in the history 
Since the OpenRewrite 8 changes the `langauge-parser-builder` hasn't been working properly anymore. Mostly due to the `JavaTemplate` API changes.
  • Loading branch information
@knutwannheden
knutwannheden committed Mar 2, 2024
1 parent ba636bb commit bb78466
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 27 deletions.
6 changes: 6 additions & 0 deletions tools/language-parser-builder/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ dependencies {
modelImplementation("ch.qos.logback:logback-classic:latest.release")
}

tasks.register<JavaExec>("runGenerator") {
mainClass = "generate.GenerateModel"
classpath = sourceSets.getByName("model").runtimeClasspath
workingDir = file("../..")
}

license {
header = file("../../gradle/licenseHeader.txt")
}
2 changes: 1 addition & 1 deletion tools/language-parser-builder/src/model/java/generate/GenerateModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void generate() {
.collect(toList())), ctx).getChangeset().getAllResults());
results.addAll(new WritePrinter(modelClasses)
.run(new InMemoryLargeSourceSet(jp().parse(List.of(
Paths.get("tools/language-parser-builder/src/main/java/org/openrewrite/toml/tree/TomlContainer.java")), null, ctx)
Paths.get("tools/language-parser-builder/src/main/java/org/openrewrite/toml/internal/TomlPrinter.java")), null, ctx)
.collect(toList())), ctx).getChangeset().getAllResults());

writeResults(results);
Expand Down
56 changes: 34 additions & 22 deletions tools/language-parser-builder/src/model/java/generate/WriteModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package generate;

import lombok.RequiredArgsConstructor;
import org.openrewrite.Cursor;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Recipe;
import org.openrewrite.internal.ListUtils;
Expand Down Expand Up @@ -66,9 +67,9 @@ public String getDescription() {
"""
).javaParser(parser).build();

final JavaTemplate idField = JavaTemplate.builder("@EqualsAndHashCode.Include UUID id;").javaParser(parser).build();
final JavaTemplate idField = JavaTemplate.builder("@EqualsAndHashCode.Include UUID id;").imports("java.util.UUID").javaParser(parser).build();
final JavaTemplate prefixField = JavaTemplate.builder("Space prefix;").javaParser(parser).build();
final JavaTemplate markersField = JavaTemplate.builder("Markers markers;").javaParser(parser).build();
final JavaTemplate markersField = JavaTemplate.builder("Markers markers;").imports("org.openrewrite.marker.Markers").javaParser(parser).build();
final JavaTemplate paddingField = JavaTemplate.builder("@Nullable @NonFinal transient WeakReference<Padding> padding;").javaParser(parser).build();
final JavaTemplate implementsTree = JavaTemplate.builder("Toml").javaParser(parser).build();

Expand Down Expand Up @@ -170,14 +171,14 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
boolean padded = c.getBody().getStatements().stream().anyMatch(this::isPadded);

if (c.getImplements() == null) {
c = implementsTree.apply(getCursor(), c.getCoordinates().addImplementsClause());
c = implementsTree.apply(updateCursor(c), c.getCoordinates().addImplementsClause());
}


c = markersField.apply(getCursor(), c.getBody().getCoordinates().firstStatement());
c = prefixField.apply(getCursor(), c.getBody().getCoordinates().firstStatement());
c = idField.apply(getCursor(), c.getBody().getCoordinates().firstStatement());
c = acceptMethod.apply(getCursor(), c.getBody().getCoordinates().lastStatement(), classDecl.getSimpleName());
c = markersField.apply(updateCursor(c), c.getBody().getCoordinates().firstStatement());
c = prefixField.apply(updateCursor(c), c.getBody().getCoordinates().firstStatement());
c = idField.apply(updateCursor(c), c.getBody().getCoordinates().firstStatement());
c = acceptMethod.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(), classDecl.getSimpleName());

for (Statement statement : c.getBody().getStatements()) {
if (statement instanceof J.VariableDeclarations varDec) {
Expand All @@ -196,24 +197,24 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
case "TomlContainer" -> writeContainerGetterWithers(c, varDec, elementType);
case "TomlLeftPadded" -> writePaddedGetterWithers(c, varDec, elementType, "Left");
case "TomlRightPadded" -> writePaddedGetterWithers(c, varDec, elementType, "Right");
default -> withGetterAnnotations.apply(getCursor(), varDec.getCoordinates()
.addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)));
default -> writeModelGetterWithers(c, varDec);
};
} else if (padded) {
c = withGetterAnnotations.apply(getCursor(), varDec.getCoordinates()
.addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)));
c = writeModelGetterWithers(c, varDec);
}
} else if (padded) {
c = writeModelGetterWithers(c, varDec);
}
}
}

if (padded) {
c = paddedModel.apply(getCursor(), c.getCoordinates().replaceAnnotations());
c = paddingField.apply(getCursor(), c.getBody().getCoordinates().firstStatement());
c = getPadding.apply(getCursor(), c.getBody().getCoordinates().lastStatement());
c = paddingClass.apply(getCursor(), c.getBody().getCoordinates().lastStatement(), c.getSimpleName());
c = paddedModel.apply(updateCursor(c), c.getCoordinates().replaceAnnotations());
c = paddingField.apply(updateCursor(c), c.getBody().getCoordinates().firstStatement());
c = getPadding.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement());
c = paddingClass.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(), c.getSimpleName());
} else {
c = valueModel.apply(getCursor(), c.getCoordinates().replaceAnnotations());
c = valueModel.apply(updateCursor(c), c.getCoordinates().replaceAnnotations());
}

List<Statement> statements = c.getBody().getStatements();
Expand All @@ -231,20 +232,30 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
return c;
}

private J.ClassDeclaration writeModelGetterWithers(J.ClassDeclaration c, J.VariableDeclarations varDec) {
return c.withBody(c.getBody().withStatements(ListUtils.map(c.getBody().getStatements(), statement -> {
if (statement == varDec) {
Cursor cursor = new Cursor(new Cursor(updateCursor(c), c.getBody()), varDec);
statement = withGetterAnnotations.apply(cursor, varDec.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)));
}
return statement;
})));
}

private J.ClassDeclaration writeContainerGetterWithers(J.ClassDeclaration c, J.VariableDeclarations varDec, JavaType.FullyQualified elementType) {
String name = varDec.getVariables().get(0).getSimpleName();
String capitalizedName = name.substring(0, 1).toUpperCase() + name.substring(1);
String elementTypeName = elementType.getClassName();
String modelTypeName = c.getSimpleName();

c = unwrappedContainerGetterWither.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
J.Block body = unwrappedContainerGetterWither.apply(new Cursor(updateCursor(c), c.getBody()), c.getBody().getCoordinates().lastStatement(),
elementTypeName, capitalizedName,
name,
modelTypeName, capitalizedName, elementTypeName, name,
capitalizedName, name,
name, name);

return c;
return c.withBody(body);
}

private J.ClassDeclaration writePaddedGetterWithers(J.ClassDeclaration c, J.VariableDeclarations varDec, JavaType.FullyQualified elementType,
Expand All @@ -255,26 +266,27 @@ private J.ClassDeclaration writePaddedGetterWithers(J.ClassDeclaration c, J.Vari
String elementTypeName = elementType.getClassName();
String modelTypeName = c.getSimpleName();

J.Block body = c.getBody();
if (nullable) {
StringJoiner newModelArguments = new StringJoiner(", ");
for (Statement statement : c.getBody().getStatements()) {
for (Statement statement : body.getStatements()) {
if (statement instanceof J.VariableDeclarations) {
newModelArguments.add(statement == varDec ? "null" : ((J.VariableDeclarations) statement).getVariables()
.get(0).getSimpleName());
}
}
c = nullableUnwrappedPaddedGetterWither.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
body = nullableUnwrappedPaddedGetterWither.apply(new Cursor(getCursor(), body), body.getCoordinates().lastStatement(),
elementTypeName, capitalizedName, name, name, modelTypeName, capitalizedName,
elementTypeName, name, name, name, modelTypeName, newModelArguments.toString(),
capitalizedName, leftOrRight, name, name);
} else {
c = unwrappedPaddedGetterWither.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
body = unwrappedPaddedGetterWither.apply(new Cursor(getCursor(), body), body.getCoordinates().lastStatement(),
elementTypeName, capitalizedName, name,
modelTypeName, capitalizedName, elementTypeName, name,
capitalizedName, leftOrRight, name, name);
}

return c;
return c.withBody(body);
}

boolean isPadded(Statement statement) {
Expand Down
2 changes: 1 addition & 1 deletion tools/language-parser-builder/src/model/java/generate/WritePaddingAccessors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private J.ClassDeclaration writePaddedGetterWithers(J.ClassDeclaration c, J.Vari
}
}

c = paddedGetterWither.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
c = paddedGetterWither.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(),
nullable ? "@Nullable " : "", leftOrRight, elementTypeName, capitalizedName,
name, modelTypeName, capitalizedName,
nullable ? "@Nullable " : "", leftOrRight,
Expand Down
2 changes: 1 addition & 1 deletion tools/language-parser-builder/src/model/java/generate/WritePrinter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
.build();

try {
c = visitMethod.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
c = visitMethod.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(),
modelTypeName, modelTypeName, paramName,
paramName,
paramName,
Expand Down
4 changes: 2 additions & 2 deletions tools/language-parser-builder/src/model/java/generate/WriteVisitorMethods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
}
}
}
c = visitMethod.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
c = visitMethod.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(),
modelTypeName, modelTypeName, paramName,
modelTypeName, varName, paramName,
varName, varName, varName,
Expand Down Expand Up @@ -168,7 +168,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
for (J.ClassDeclaration modelClass : missingVisitorMethods(c)) {
String modelTypeName = modelClass.getSimpleName();
String paramName = modelTypeName.substring(0, 1).toLowerCase() + modelTypeName.substring(1);
c = isoVisitMethod.apply(getCursor(), c.getBody().getCoordinates().lastStatement(),
c = isoVisitMethod.apply(updateCursor(c), c.getBody().getCoordinates().lastStatement(),
modelTypeName, modelTypeName, modelTypeName, paramName,
modelTypeName, modelTypeName, paramName);
}
Expand Down

0 comments on commit bb78466

Please sign in to comment.