Skip to content

Commit

Permalink
Fix parameter patch generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukebemish
lukebemish committed Oct 10, 2023
1 parent 5c57ebc commit 0834861
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group = 'dev.lukebemish.docpatcher'
version = '0.1.2'
version = '0.1.3'

java {
// I don't feel like dealing with old java...
Expand Down
58 changes: 50 additions & 8 deletions src/main/java/dev/lukebemish/docpatcher/plugin/impl/SpoonJavadocVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,17 @@ public ClassJavadoc visit(CtType<?> clean, CtType<?> modified) {
if (!comments.isEmpty()) {
var javadocComment = comments.get(0);
if (javadocComment instanceof CtJavaDoc javadoc) {
ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc);
String[] parameters = null;
if (modified instanceof CtRecord ctRecord) {
parameters = ctRecord.getRecordComponents().stream().map(CtRecordComponent::getSimpleName).toArray(String[]::new);
}

var typeParameters = modified.getFormalCtTypeParameters().stream().map(CtTypeParameter::getSimpleName).toArray(String[]::new);

ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc, parameters, typeParameters);

if (result.contentDiff() != null || !result.tags().isEmpty()) {
classJavadocEntry = new JavadocEntry(result.contentDiff(), result.tags().isEmpty() ? null : result.tags(), null, null);
classJavadocEntry = new JavadocEntry(result.contentDiff(), result.tags().isEmpty() ? null : result.tags(), result.parameters, result.typeParameters);
}
}
}
Expand Down Expand Up @@ -126,10 +133,17 @@ private JavadocEntry visit(CtExecutable<?> clean, CtExecutable<?> modified) {
if (!comments.isEmpty()) {
var javadocComment = comments.get(0);
if (javadocComment instanceof CtJavaDoc javadoc) {
ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc);
String[] parameters = modified.getParameters().stream().map(CtParameter::getSimpleName).toArray(String[]::new);

String[] typeParameters = null;
if (modified instanceof CtFormalTypeDeclarer formalTypeDeclarer) {
typeParameters = formalTypeDeclarer.getFormalCtTypeParameters().stream().map(CtTypeParameter::getSimpleName).toArray(String[]::new);
}

ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc, parameters, typeParameters);

if (result.contentDiff() != null || !result.tags().isEmpty()) {
javadocEntry = new JavadocEntry(result.contentDiff(), result.tags().isEmpty() ? null : result.tags(), null, null);
javadocEntry = new JavadocEntry(result.contentDiff(), result.tags().isEmpty() ? null : result.tags(), result.parameters, result.typeParameters);
}
}
}
Expand All @@ -151,7 +165,7 @@ private JavadocEntry visit(CtField<?> clean, CtField<?> modified) {
if (!comments.isEmpty()) {
var javadocComment = comments.get(0);
if (javadocComment instanceof CtJavaDoc javadoc) {
ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc);
ProcessedJavadoc result = processJavadocs(javadoc, originalJavadoc, null, null);

if (result.contentDiff() != null || !result.tags().isEmpty()) {
javadocEntry = new JavadocEntry(result.contentDiff(), result.tags().isEmpty() ? null : result.tags(), null, null);
Expand All @@ -163,7 +177,7 @@ private JavadocEntry visit(CtField<?> clean, CtField<?> modified) {
}

@NotNull
private static ProcessedJavadoc processJavadocs(CtJavaDoc javadoc, CtJavaDoc originalJavadoc) {
private static ProcessedJavadoc processJavadocs(CtJavaDoc javadoc, CtJavaDoc originalJavadoc, String[] parameters, String[] typeParameters) {
var content = javadoc.getLongDescription();
Map<String, List<String>> tags = new HashMap<>();
for (var tag : javadoc.getTags()) {
Expand All @@ -173,6 +187,34 @@ private static ProcessedJavadoc processJavadocs(CtJavaDoc javadoc, CtJavaDoc ori
}
tags.computeIfAbsent(tag.getType().getName(), k -> new ArrayList<>()).add(tagContent);
}
List<String> parametersOut = null;
if (parameters != null && tags.containsKey("param")) {
var params = tags.get("param");
parametersOut = new ArrayList<>();
for (String parameter : parameters) {
var optional = params.stream().filter(s -> s.trim().split(" ")[0].equals(parameter)).findFirst();
if (optional.isPresent()) {
parametersOut.add(optional.get().trim().substring(parameter.length()+1));
params.remove(optional.get());
} else {
parametersOut.add("");
}
}
}
List<String> typeParametersOut = null;
if (typeParameters != null && tags.containsKey("param")) {
var params = tags.get("param");
typeParametersOut = new ArrayList<>();
for (String parameter : typeParameters) {
var optional = params.stream().filter(s -> s.trim().split(" ")[0].equals('<'+parameter+'>')).findFirst();
if (optional.isPresent()) {
typeParametersOut.add(optional.get().trim().substring(parameter.length()+3));
params.remove(optional.get());
} else {
typeParametersOut.add("");
}
}
}
String contentDiff = content;
if (originalJavadoc != null) {
var originalContent = originalJavadoc.getLongDescription();
Expand All @@ -192,8 +234,8 @@ private static ProcessedJavadoc processJavadocs(CtJavaDoc javadoc, CtJavaDoc ori
}
}
}
return new ProcessedJavadoc(tags, contentDiff);
return new ProcessedJavadoc(tags, contentDiff, parametersOut == null || parametersOut.isEmpty() ? null : parametersOut.toArray(String[]::new), typeParametersOut == null || typeParametersOut.isEmpty() ? null : typeParametersOut.toArray(String[]::new));
}

private record ProcessedJavadoc(Map<String, List<String>> tags, String contentDiff) {}
private record ProcessedJavadoc(Map<String, List<String>> tags, String contentDiff, String[] parameters, String[] typeParameters) {}
}

0 comments on commit 0834861

Please sign in to comment.