diff --git a/.ci/pitest-suppressions/pitest-coding-require-this-check-suppressions.xml b/.ci/pitest-suppressions/pitest-coding-require-this-check-suppressions.xml index 3bf57197635..0eec245a679 100644 --- a/.ci/pitest-suppressions/pitest-coding-require-this-check-suppressions.xml +++ b/.ci/pitest-suppressions/pitest-coding-require-this-check-suppressions.xml @@ -1,14 +1,5 @@ - - RequireThisCheck.java - com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck - beginTree - org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_IF - removed conditional - replaced equality check with true - if (toVisit == null) { - - RequireThisCheck.java com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck diff --git a/.ci/pitest-survival-check-html.sh b/.ci/pitest-survival-check-html.sh index 26078f26936..7322b3c4fcb 100755 --- a/.ci/pitest-survival-check-html.sh +++ b/.ci/pitest-survival-check-html.sh @@ -200,7 +200,6 @@ pitest-coding-require-this-check) declare -a ignoredItems=( "RequireThisCheck.java.html:
                        && ast.getParent().getType() != TokenTypes.LITERAL_CATCH) {
" "RequireThisCheck.java.html:
                if (isAnonymousClassDef(ast)) {
" - "RequireThisCheck.java.html:
                if (toVisit == null) {
" "RequireThisCheck.java.html:
               && parent.getType() != TokenTypes.CTOR_DEF
" "RequireThisCheck.java.html:
            && lastChild.getType() == TokenTypes.OBJBLOCK;
" "RequireThisCheck.java.html:
            if (definitionToken.getType() == TokenTypes.STATIC_INIT) {
" diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java index 08d4927402f..42a62fcd9f0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java @@ -383,9 +383,7 @@ public void beginTree(DetailAST rootAST) { while (curNode != null && toVisit == null) { endCollectingDeclarations(frameStack, curNode); toVisit = curNode.getNextSibling(); - if (toVisit == null) { - curNode = curNode.getParent(); - } + curNode = curNode.getParent(); } curNode = toVisit; }