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

#17: added support for varargs with methods for array type members #18

Merged
merged 1 commit into from
Aug 8, 2018
Merged
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 @@ -88,7 +88,8 @@ private void generateWithSetters(final PsiClass builderClass, final List<PsiFiel
PsiUtil.setModifierProperty(withMethod, PsiModifier.PUBLIC, true);

// Add parameter
final PsiParameter parameter = psiElementFactory.createParameter(fieldName, field.getType());
final PsiType psiType = getSanitizedType(field.getType());
final PsiParameter parameter = psiElementFactory.createParameter(fieldName, psiType);
PsiUtil.setModifierProperty(parameter, PsiModifier.FINAL, true);
withMethod.getParameterList().add(parameter);

Expand Down Expand Up @@ -116,6 +117,14 @@ private void generateWithSetters(final PsiClass builderClass, final List<PsiFiel
}
}

private PsiType getSanitizedType(final PsiType psiType) {
if (psiType instanceof PsiArrayType) {
return new PsiEllipsisType(psiType.getDeepComponentType());
Copy link
Owner

Choose a reason for hiding this comment

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

WTH is a deep component type? The JetBrains API sucks.

Copy link
Owner

Choose a reason for hiding this comment

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

}

return psiType;
}

private void generateCreateMethod(final PsiClass builderClass) {
final PsiType builderType = TypeUtils.getType(builderClass);
final PsiMethod createMethod = psiElementFactory.createMethod("create", builderType);
Expand Down