review fix: EnumValues constructor call should be marked as implicit#2090
Merged
monperrus merged 10 commits intoINRIA:masterfrom Jun 22, 2018
Merged
review fix: EnumValues constructor call should be marked as implicit#2090monperrus merged 10 commits intoINRIA:masterfrom
monperrus merged 10 commits intoINRIA:masterfrom
Conversation
surli
changed the title
surli
changed the title
monperrus
reviewed
Jun 21, 2018
|
|
||
| List<CtComment> comments = firstEnumValue.getComments(); | ||
| assertEquals(1, comments.size()); | ||
| assertTrue(comments.get(0) instanceof CtJavaDoc); |
Collaborator
There was a problem hiding this comment.
assert on the comment content
surli
changed the title
monperrus
reviewed
Jun 21, 2018
|
|
||
| for (CtEnumValue enumValue : enumValues) { | ||
| CtExpression defaultExpression = enumValue.getDefaultExpression(); | ||
| assertTrue(defaultExpression.isImplicit()); |
Collaborator
There was a problem hiding this comment.
assert on the pretty-print of enum values (implicit constructor calls)
surli
changed the title
Collaborator
Author
|
@pvojtechovsky I got an assertion error with elementPrinterHelper.printList(ctEnum.getEnumValues(),
null, false, null, false, false, "," + DefaultJavaPrettyPrinter.LINE_SEPARATOR, false, false, ";",
enumValue -> scan(enumValue));I don't really know where to start for fixing that one... Do you have an idea? |
| elementPrinterHelper.printList(ctEnum.getEnumValues(), | ||
| null, false, null, false, false, ",", true, false, ";", | ||
| null, false, null, false, false, "," + DefaultJavaPrettyPrinter.LINE_SEPARATOR, false, false, ";", | ||
| enumValue -> scan(enumValue)); |
Collaborator
There was a problem hiding this comment.
it is not actually allowed to send token which contains two different token types: "," and EOL
Solution:
replace
enumValue -> scan(enumValue)with
enumValue -> {
printer.writeln();
scan(enumValue)
}| if (!constructorCall.isImplicit()) { | ||
| this.getPrinterTokenWriter().writeSeparator("("); | ||
| elementPrinterHelper.printList(constructorCall.getArguments(), null, false, null, false, false, ",", true, false, null, expr -> scan(expr)); | ||
| this.getPrinterTokenWriter().writeSeparator(")"); |
Collaborator
There was a problem hiding this comment.
remove both writeSepratator calls and use instead:
elementPrinterHelper.printList(constructorCall.getArguments(), null, false, "(", false, false, ",", true, false, ")", expr -> scan(expr));
Collaborator
Author
There was a problem hiding this comment.
Hmmm I tried with "(" for the first parameter, but it works indeed better at the right place :)
surli
changed the title
surli
changed the title
Collaborator
|
should only be merged after #2096? |
Collaborator
Author
|
No it can be already merged |
surli
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.