ChopIfTooLong for methodInvocation chains #6112
Conversation
rewrite-java/src/main/java/org/openrewrite/java/format/WrapMethodChains.java
Outdated
Show resolved
Hide resolved
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
rewrite-java/src/test/java/org/openrewrite/java/format/MinimumViableSpacingVisitorTest.java
Outdated
Show resolved
Hide resolved
# Conflicts: # rewrite-java/src/main/java/org/openrewrite/java/format/WrapMethodChains.java
rewrite-java/src/main/java/org/openrewrite/java/format/WrapMethodChains.java
Outdated
Show resolved
Hide resolved
…hodChains.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
| class LengthCalculator { | ||
|
|
||
| public static int computeTreeLineLength(J tree, Cursor cursor) { | ||
| Object cursorValue = cursor.getValue(); | ||
| if (cursorValue instanceof J) { | ||
| J j = (J) cursorValue; | ||
| boolean hasNewLine = j.getPrefix().getWhitespace().contains("\n") || j.getComments().stream().anyMatch(c -> c.getSuffix().contains("\n")); | ||
| Cursor parent = cursor.getParentTreeCursor(); | ||
| boolean isCompilationUnit = parent.getValue() instanceof J.CompilationUnit; | ||
| if (!hasNewLine && !isCompilationUnit) { | ||
| return computeTreeLineLength(parent.getValue(), parent); | ||
| } | ||
| } else { | ||
| throw new RuntimeException("Unable to calculate length due to unexpected cursor value: " + cursorValue.getClass()); | ||
| } |
There was a problem hiding this comment.
We have a service mechanism for supplying language-specific implementations of concepts that appear in multiple languages. This strikes me as a good candidate for that pattern. See JavaSourceFile.service().
This is how a JavaVisitor can visit a kotlin source file and have maybeAddImport() use the kotlin version of AddImport to do it.
I see this as the default SourcePositionService. While you don't need to do it right now, it could be a reasonable place to put a getLineNumber() or getStartColumn()/getEndColumn() methods which are sometimes requested. Methods like these could be relevant in any language or data format.
There could be Groovy/Kotlin variations which, for example, return false more often in needsSemicolon as those languages only require them to separate multiple statements on the same line.
There was a problem hiding this comment.
I took this approach from ColumnPositionCalculator already present. Is that then also a good candidate?
This method though does not getLineNumber but gets the length of the current element (including its newlines) starting from the first element that starts on it's line.
Counting the prefix (indentation only) of that element + the length. I struggled to find an explanatory name for that. Any suggestions?
| if (method.getName().getComments().isEmpty() && method.getName().getPrefix().getWhitespace().contains("\n")) { | ||
| return method.withName(method.getName().withPrefix(Space.EMPTY)); | ||
| } | ||
| return super.visitMethodInvocation(method, p); |
There was a problem hiding this comment.
A method invocation meeting this condition could be contained within another method invocation which meets this condition. In that circumstance the inner method would not be reformatted as no traversal into sub-elements happens when this condition is matched.
There was a problem hiding this comment.
good catch, thanks!
2 participants
Also support ChopIfTooLong for the recently added WrapMethodChains formatter.