Skip to content

Skip block comment containing a comma between call arguments #21

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
electrum merged 1 commit into from
Jun 10, 2026
Merged

Skip block comment containing a comma between call arguments #21

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: 11 additions & 0 deletions airstyle-core/src/main/java/io/airlift/airstyle/engine/java/JavaExpressionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,17 @@ else if (i > 0) {
ASTNode nextArg = (ASTNode) arguments.get(i + 1);
int nextArgStart = nextArg.getStartPosition();
for (int j = argEnd; j < nextArgStart && j < source.length(); j++) {
// Skip comments — their text may contain commas.
if (source.charAt(j) == '/' && j + 1 < source.length()
&& (source.charAt(j + 1) == '/' || source.charAt(j + 1) == '*')) {
for (JavaTokens.Token tok : tokensIn(j, nextArgStart)) {
if (tok.start() == j && tok.isComment()) {
j = tok.end() - 1;
break;
}
}
continue;
}
if (source.charAt(j) == ',') {
argEnd = j + 1;
// Extend through any same-line trailing comment after
Expand Down
64 changes: 64 additions & 0 deletions airstyle-core/src/test/java/io/airlift/airstyle/TestCommentPreservationFormatting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,70 @@ void run()
assertCanonicalFormatting(code);
}

@Test
void testFormatterKeepsInlineBlockCommentContainingACommaBetweenArguments()
{
String code =
"""
class Test
{
void run()
{
verify(metadata,
LegacyClass.class,
null,
false /* don't care, but this comment contains a comma */,
attributes);
}
}
""";

assertCanonicalFormatting(code);
}

@Test
void testFormatterKeepsInlineJavadocCommentContainingACommaBetweenArguments()
{
String code =
"""
class Test
{
void run()
{
verify(metadata,
LegacyClass.class,
null,
false /** don't care, but this comment contains a comma */,
attributes);
}
}
""";

assertCanonicalFormatting(code);
}

@Test
void testFormatterKeepsInlineLineCommentContainingACommaBetweenArguments()
{
String code =
"""
class Test
{
void run()
{
verify(metadata,
LegacyClass.class,
null,
false // don't care, but this comment contains a comma
,
attributes);
}
}
""";

assertCanonicalFormatting(code);
}

@Test
void testFormatterKeepsBlockCommentInsideForLoopHeader()
{
Expand Down