diff --git a/.ci/pitest-suppressions/pitest-coding-1-suppressions.xml b/.ci/pitest-suppressions/pitest-coding-1-suppressions.xml index 87b789614ce..e3bb01fbde1 100644 --- a/.ci/pitest-suppressions/pitest-coding-1-suppressions.xml +++ b/.ci/pitest-suppressions/pitest-coding-1-suppressions.xml @@ -108,15 +108,6 @@ switch (blockWithVariableUsage.getType()) { - - VariableDeclarationUsageDistanceCheck.java - com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck - calculateDistanceInSingleScope - org.pitest.mutationtest.engine.gregor.mutators.RemoveConditionalMutator_EQUAL_ELSE - removed conditional - replaced equality check with false - if (!firstUsageFound) { - - VariableDeclarationUsageDistanceCheck.java com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java index 322c2e10cd7..01b38a36690 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java @@ -522,6 +522,8 @@ else if (!instanceName.equals(initInstanceName)) { * @param variableIdentAst * Variable which distance is calculated for. * @return entry which contains expression with variable usage and distance. + * If variable usage is not found, then the expression node is null, + * although the distance can be greater than zero. */ private static Entry calculateDistanceInSingleScope( DetailAST semicolonAst, DetailAST variableIdentAst) { @@ -544,11 +546,6 @@ else if (currentAst.getType() != TokenTypes.VARIABLE_DEF) { currentAst = currentAst.getNextSibling(); } - // If variable wasn't used after its declaration, distance is 0. - if (!firstUsageFound) { - dist = 0; - } - return new SimpleEntry<>(variableUsageAst, dist); }