Skip to content

feat: improve printing of class with long typeParameterList #512

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.

Sign up for GitHub

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

Merged
clementdessoude merged 1 commit into from
Oct 16, 2021
Merged

feat: improve printing of class with long typeParameterList #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions packages/prettier-plugin-java/src/printers/classes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,19 @@ export class ClassesPrettierVisitor extends BaseCstPrettierPrinter {
typeParameters(ctx: TypeParametersCtx) {
const typeParameterList = this.visit(ctx.typeParameterList);

return rejectAndConcat([ctx.Less[0], typeParameterList, ctx.Greater[0]]);
return putIntoBraces(
typeParameterList,
softline,
ctx.Less[0],
ctx.Greater[0]
);
}

typeParameterList(ctx: TypeParameterListCtx) {
const typeParameter = this.mapVisit(ctx.typeParameter);
const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, " "])) : [];
const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];

return rejectAndJoinSeps(commas, typeParameter);
return group(rejectAndJoinSeps(commas, typeParameter));
}

superclass(ctx: SuperclassCtx) {
Expand Down
6 changes: 6 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/complex_generic_class/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ public void addAll(final Collection<? extends E> c) {
}

}

public abstract class AbstractGenericClass<Value extends AbstractValue, Value1 extends AbstractValue, Value2 extends AbstractValue, Value3 extends AbstractValue, Value4 extends AbstractValue, Value5 extends AbstractValue> {
public Value getValue() {
return new Value();
}
}
14 changes: 14 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/complex_generic_class/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,17 @@ public void addAll(final Collection<? extends E> c) {
}
}
}

public abstract class AbstractGenericClass<
Value extends AbstractValue,
Value1 extends AbstractValue,
Value2 extends AbstractValue,
Value3 extends AbstractValue,
Value4 extends AbstractValue,
Value5 extends AbstractValue
> {

public Value getValue() {
return new Value();
}
}
6 changes: 5 additions & 1 deletion packages/prettier-plugin-java/test/unit-test/generic_class/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ public <T> T doSomething(T t) {
}
}

public class ComplexGenericClass<BEAN extends AbstractBean & BeanItemSelect<BEANTYPE>, BEANTYPE, CONFIG extends BeanConfig<BEAN, BEANTYPE, CONFIG>>
public class ComplexGenericClass<
BEAN extends AbstractBean & BeanItemSelect<BEANTYPE>,
BEANTYPE,
CONFIG extends BeanConfig<BEAN, BEANTYPE, CONFIG>
>
extends AbstractBeanConfig<BEAN, CONFIG> {

public <BEAN> List<? super BEAN> getBean(final Class<BEAN> beanClass) {
Expand Down