Skip to content

Issue #17128: ignore import lines during check, fix alignment in more input files #17714

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
romani merged 1 commit into from
Aug 31, 2025
Merged

Issue #17128: ignore import lines during check, fix alignment in more input files #17714

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
5 changes: 3 additions & 2 deletions ...ava/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class IndentationTrailingCommentsVerticalAlignmentTest {
"InputIndentationLambda.java",
"InputIndentationLambda1.java",
"InputIndentationLambda2.java",
"InputIndentationLineWrappedRecordDeclaration.java",
"InputIndentationMethodPrecededByAnnotationWithParameterOnSeparateLine.java",
"InputIndentationNewChildren.java",
"InputIndentationNewWithForceStrictCondition.java",
Expand All @@ -86,7 +85,6 @@ class IndentationTrailingCommentsVerticalAlignmentTest {
"InputIndentationTryResourcesNotStrict1.java",
"InputIndentationTryWithResourcesStrict.java",
"InputIndentationTryWithResourcesStrict1.java",
"InputIndentationValidBlockIndent1.java",
"InputIndentationValidClassDefIndent.java",
"InputIndentationValidClassDefIndent1.java",
"InputIndentationCorrectIfAndParameter1.java",
Expand All @@ -106,6 +104,9 @@ public void testTrailingCommentsAlignment(Path testFile) throws IOException {

for (int idx = 0; idx < lines.size(); idx++) {
final String line = lines.get(idx);
if (line.trim().startsWith("import ")) {
continue;
}
final int commentStartIndex = line.indexOf("//indent:");
if (commentStartIndex > 0) {
final String codePart = line.substring(0, commentStartIndex);
Expand Down
172 changes: 86 additions & 86 deletions ...eckstyle/checks/indentation/indentation/InputIndentationLineWrappedRecordDeclaration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
// Java17 //indent:0 exp:0
package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0
//indent:82 exp:82
import java.io.IOException; //indent:0 exp:0
//indent:82 exp:82
/* Config: //indent:0 exp:0
* //indent:1 exp:1
* basicOffset = 4 //indent:1 exp:1
* braceAdjustment = 0 //indent:1 exp:1
* caseIndent = 4 //indent:1 exp:1
* throwsIndent = 4 //indent:1 exp:1
* arrayInitIndent = 4 //indent:1 exp:1
* lineWrappingIndentation = 4 //indent:1 exp:1
* forceStrictCondition = false //indent:1 exp:1
*/ //indent:1 exp:1
//indent:82 exp:82
class InputIndentationLineWrappedRecordDeclaration { //indent:0 exp:0
private interface Interf { //indent:4 exp:4
String sayHello(); //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
private static record ConcreteRecord( //indent:4 exp:4
String greeting //indent:8 exp:8
) implements Interf { //indent:4 exp:4
@Override //indent:8 exp:8
public String sayHello() { //indent:4 exp:4
return greeting(); //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
private static record ConcreteRecord2( //indent:4 exp:4
String greeting //indent:8 exp:8
) implements Interf { //indent:0 exp:4 warn
@Override //indent:8 exp:8
public String sayHello() { //indent:4 exp:4
return greeting(); //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
private static String method( //indent:4 exp:4
String greeting //indent:8 exp:8
) throws Exception { //indent:4 exp:4
return greeting + "test"; //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
interface SimpleInterface1 { //indent:4 exp:4
default //indent:8 exp:8
void //indent:12 exp:12
method() //indent:12 exp:12
throws //indent:12 exp:12
IOException { //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
interface SimpleInterface2 { //indent:0 exp:4 warn
default //indent:0 exp:8 warn
void //indent:0 exp:4 warn
method() //indent:0 exp:4 warn
throws //indent:0 exp:4 warn
IOException { //indent:0 exp:4 warn
} //indent:0 exp:8 warn
} //indent:0 exp:4 warn
//indent:82 exp:82
record SimpleRecord1( //indent:4 exp:4
) //indent:4 exp:4
implements //indent:12 exp:12
SimpleInterface1 //indent:12 exp:12
{ //indent:4 exp:4
record Inner1( //indent:8 exp:8
) //indent:8 exp:8
{ //indent:8 exp:8
} //indent:8 exp:8
} //indent:4 exp:4
//indent:82 exp:82
record SimpleRecord2( //indent:0 exp:4 warn
) //indent:0 exp:4 warn
implements //indent:0 exp:4 warn
SimpleInterface2 { //indent:0 exp:4 warn
record Inner2 //indent:0 exp:8 warn
( //indent:0 exp:4 warn
) //indent:0 exp:8 warn
{ //indent:0 exp:8 warn
} //indent:0 exp:8 warn
} //indent:0 exp:4 warn
//indent:82 exp:82
} //indent:0 exp:0
// Java17 //indent:0 exp:0
package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0
//indent:72 exp:72
import java.io.IOException; //indent:0 exp:0
//indent:72 exp:72
/* Config: //indent:0 exp:0
* //indent:1 exp:1
* basicOffset = 4 //indent:1 exp:1
* braceAdjustment = 0 //indent:1 exp:1
* caseIndent = 4 //indent:1 exp:1
* throwsIndent = 4 //indent:1 exp:1
* arrayInitIndent = 4 //indent:1 exp:1
* lineWrappingIndentation = 4 //indent:1 exp:1
* forceStrictCondition = false //indent:1 exp:1
*/ //indent:1 exp:1
//indent:72 exp:72
class InputIndentationLineWrappedRecordDeclaration { //indent:0 exp:0
private interface Interf { //indent:4 exp:4
String sayHello(); //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
private static record ConcreteRecord( //indent:4 exp:4
String greeting //indent:8 exp:8
) implements Interf { //indent:4 exp:4
@Override //indent:8 exp:8
public String sayHello() { //indent:4 exp:4
return greeting(); //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
private static record ConcreteRecord2( //indent:4 exp:4
String greeting //indent:8 exp:8
) implements Interf { //indent:0 exp:4 warn
@Override //indent:8 exp:8
public String sayHello() { //indent:4 exp:4
return greeting(); //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
private static String method( //indent:4 exp:4
String greeting //indent:8 exp:8
) throws Exception { //indent:4 exp:4
return greeting + "test"; //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
interface SimpleInterface1 { //indent:4 exp:4
default //indent:8 exp:8
void //indent:12 exp:12
method() //indent:12 exp:12
throws //indent:12 exp:12
IOException { //indent:12 exp:12
} //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
interface SimpleInterface2 { //indent:0 exp:4 warn
default //indent:0 exp:8 warn
void //indent:0 exp:4 warn
method() //indent:0 exp:4 warn
throws //indent:0 exp:4 warn
IOException { //indent:0 exp:4 warn
} //indent:0 exp:8 warn
} //indent:0 exp:4 warn
//indent:72 exp:72
record SimpleRecord1( //indent:4 exp:4
) //indent:4 exp:4
implements //indent:12 exp:12
SimpleInterface1 //indent:12 exp:12
{ //indent:4 exp:4
record Inner1( //indent:8 exp:8
) //indent:8 exp:8
{ //indent:8 exp:8
} //indent:8 exp:8
} //indent:4 exp:4
//indent:72 exp:72
record SimpleRecord2( //indent:0 exp:4 warn
) //indent:0 exp:4 warn
implements //indent:0 exp:4 warn
SimpleInterface2 { //indent:0 exp:4 warn
record Inner2 //indent:0 exp:8 warn
( //indent:0 exp:4 warn
) //indent:0 exp:8 warn
{ //indent:0 exp:8 warn
} //indent:0 exp:8 warn
} //indent:0 exp:4 warn
//indent:72 exp:72
} //indent:0 exp:0
Loading
Loading