Skip to content

Commit 339f47b

Browse files
committed
Fix quality flaw
1 parent 810cb0b commit 339f47b

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

java-checks/src/main/java/org/sonar/java/checks/IndentationCheck.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,25 +104,33 @@ public void visitNode(Tree tree) {
104104
}
105105
expectedLevel += indentationLevel;
106106
isBlockAlreadyReported = false;
107+
checkCaseGroup(tree);
108+
checkClassTree(tree);
109+
checkBlock(tree);
110+
}
107111

112+
private void checkCaseGroup(Tree tree) {
108113
if (tree.is(Kind.CASE_GROUP)) {
109114
List<CaseLabelTree> labels = ((CaseGroupTree) tree).labels();
110115
if (labels.size() >= 2) {
111116
CaseLabelTree previousCaseLabelTree = labels.get(labels.size() - 2);
112117
lastCheckedLine = LastSyntaxTokenFinder.lastSyntaxToken(previousCaseLabelTree).line();
113118
}
119+
checkIndentation(((CaseGroupTree) tree).body());
114120
}
121+
}
115122

123+
private void checkClassTree(Tree tree) {
116124
if (isClassTree(tree)) {
117125
ClassTree classTree = (ClassTree) tree;
118126
// Exclude anonymous classes
119127
if (classTree.simpleName() != null) {
120128
checkIndentation(classTree.members());
121129
}
122130
}
123-
if (tree.is(Kind.CASE_GROUP)) {
124-
checkIndentation(((CaseGroupTree) tree).body());
125-
}
131+
}
132+
133+
private void checkBlock(Tree tree) {
126134
if (tree.is(Kind.BLOCK)) {
127135
if (tree.parent().is(Kind.LAMBDA_EXPRESSION)) {
128136
expectedLevel += indentationLevel;

0 commit comments

Comments
 (0)