diff --git a/.ci/pitest.sh b/.ci/pitest.sh index 6295036dbf5b..a1980e12336f 100755 --- a/.ci/pitest.sh +++ b/.ci/pitest.sh @@ -70,7 +70,6 @@ pitest-header) pitest-imports) mvn -e -P$1 clean test org.pitest:pitest-maven:mutationCoverage; declare -a ignoredItems=( - "CustomImportOrderCheck.java.html:
        if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)) {
" "IllegalImportCheck.java.html:
        if (!result) {
" "ImportControlLoader.java.html:
        else if (ALLOW_ELEMENT_NAME.equals(qName) || "disallow".equals(qName)) {
" "ImportOrderCheck.java.html:
                else if (matcher.start() == bestPos && matcher.end() > bestEnd) {
" diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java index ce58bfec8d37..a540dc988112 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java @@ -768,16 +768,14 @@ else if (customImportOrderRules.contains(SAME_PACKAGE_RULE_GROUP)) { bestMatch.matchLength = importPath.length(); } } - if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)) { - for (String group : customImportOrderRules) { - if (STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(group)) { - bestMatch = findBetterPatternMatch(importPath, - STANDARD_JAVA_PACKAGE_RULE_GROUP, standardPackageRegExp, bestMatch); - } - if (SPECIAL_IMPORTS_RULE_GROUP.equals(group)) { - bestMatch = findBetterPatternMatch(importPath, - group, specialImportsRegExp, bestMatch); - } + for (String group : customImportOrderRules) { + if (STANDARD_JAVA_PACKAGE_RULE_GROUP.equals(group)) { + bestMatch = findBetterPatternMatch(importPath, + STANDARD_JAVA_PACKAGE_RULE_GROUP, standardPackageRegExp, bestMatch); + } + if (SPECIAL_IMPORTS_RULE_GROUP.equals(group)) { + bestMatch = findBetterPatternMatch(importPath, + group, specialImportsRegExp, bestMatch); } } if (bestMatch.group.equals(NON_GROUP_RULE_GROUP)