Skip to content

Commit 02baf03

Browse files
cushongoogle-java-format Team
authored andcommitted
Include logVarargs in google-java-format formatting special case
PiperOrigin-RevId: 917325990
1 parent 6bbd4a4 commit 02baf03

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,8 @@ public Void visitMethodInvocation(MethodInvocationTree node, Void unused) {
16891689
* }</pre>
16901690
*/
16911691
private boolean handleLogStatement(MethodInvocationTree node) {
1692-
if (!getMethodName(node).contentEquals("log")) {
1692+
Name methodName = getMethodName(node);
1693+
if (!methodName.contentEquals("log") && !methodName.contentEquals("logVarargs")) {
16931694
return false;
16941695
}
16951696
Deque<ExpressionTree> parts = new ArrayDeque<>();

core/src/test/resources/com/google/googlejavaformat/java/testdata/B25787055.input

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,10 @@ class B25787055 {
2626
"Scratch Session Cleaner exiting. Number of deleted sessions: %d, names: %s",
2727
deletedPersistentNames.size(),
2828
deletedPersistentNames);
29+
logger
30+
.atInfo()
31+
.logVarargs(
32+
"Scratch Session Cleaner exiting. Number of deleted sessions: %d, names: %s",
33+
arguments);
2934
}
3035
}

core/src/test/resources/com/google/googlejavaformat/java/testdata/B25787055.output

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ class B25787055 {
1919
.log(
2020
"Scratch Session Cleaner exiting. Number of deleted sessions: %d, names: %s",
2121
deletedPersistentNames.size(), deletedPersistentNames);
22+
logger.atInfo().logVarargs(
23+
"Scratch Session Cleaner exiting. Number of deleted sessions: %d, names: %s", arguments);
2224
}
2325
}

0 commit comments

Comments
 (0)