Introduce unformatted toString #239
Merged
Conversation
This file contains 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
PR Review ChecklistDo not edit the content of this comment. The PR reviewer should simply update this comment by ticking each review item below, as they get completed. Code
Architecture
|
flyingsilverfin
commented
Oct 21, 2022
| @@ -54,7 +54,9 @@ public Negation(T pattern) { | |||
| this.pattern = pattern; | |||
| } | |||
|
|
|||
| public T pattern() { return pattern; } | |||
| public T pattern() { | |||
| @@ -71,4 +71,6 @@ default Conjunctable asConjunctable() { | |||
|
|
|||
| @Override | |||
| String toString(); | |||
|
|
|||
| String toString(boolean pretty); | |||
There was a problem hiding this comment.
new interface method
| @@ -171,15 +171,27 @@ private static void validateThen(String label, @Nullable Conjunction<? extends P | |||
|
|
|||
| @Override | |||
| public String toString() { | |||
| return toString(true); | |||
There was a problem hiding this comment.
default is that we pretty print
| body.append(NEW_LINE).append(CURLY_CLOSE); | ||
| rule.append(indent(body)); | ||
| } else { | ||
| rule.append(COLON); |
| .filter(s -> !s.isEmpty()).collect(COMMA_NEW_LINE.joiner()); | ||
| constraints = indent(constraints).trim(); | ||
| } else { | ||
| constraints = Stream.of(isaSyntax(), hasSyntax()).filter(s -> !s.isEmpty()).collect(COMMA.joiner()); |
| constraints = Stream.of(thingSyntax(), hasSyntax()).filter(s -> !s.isEmpty()).collect(COMMA_NEW_LINE.joiner()); | ||
| constraints = indent(constraints).trim(); | ||
| } else { | ||
| constraints = Stream.of(thingSyntax(), hasSyntax()).filter(s -> !s.isEmpty()).collect(COMMA.joiner()); |
| @@ -109,12 +110,17 @@ public TypeQLMatch.Group.Aggregate asMatchGroupAggregate() { | |||
| } | |||
| } | |||
|
|
|||
| protected void appendSubQuery(StringBuilder query, TypeQLToken.Command command, List<?> elements) { | |||
| protected void appendSubQuery(StringBuilder query, TypeQLToken.Command command, Stream<String> elements, boolean pretty) { | |||
There was a problem hiding this comment.
since this is a very generic method that can't even take a generic, we just pass in the string stream that must be pre-prepared
haikalpribadi
approved these changes
Oct 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What is the goal of this PR?
We introduce an unformatted
toStringmethod which will not introduce any indentation or newlines.This fixes a bug where a user's strings with newlines in them receive indentation in the middle of the attribute. Now, to avoid this visual or downstream effect the API exists to disable newlines and indentation.
What are the changes implemented in this PR?
toString(boolean pretty)which allows enabling or disabling pretty-printing. This API is available onDefineable,TypeQLQuery, andPattern, but notConstraintsince these are very short and don't do any pretty printing themselves.toString()on all objects does do pretty printing when the option is available