diff --git a/config/checker-framework-suppressions/checker-index-suppressions.xml b/config/checker-framework-suppressions/checker-index-suppressions.xml index 752717ffdde..197ad5a5713 100644 --- a/config/checker-framework-suppressions/checker-index-suppressions.xml +++ b/config/checker-framework-suppressions/checker-index-suppressions.xml @@ -11,17 +11,6 @@ - - src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java - argument - incompatible argument for parameter bitIndex of BitSet.get. - return getBranchTokenTypes().get(tokenType); -
- found : int - required: @NonNegative int -
-
- src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java argument diff --git a/config/import-control.xml b/config/import-control.xml index 82907b2dbbc..2e909b59e6e 100644 --- a/config/import-control.xml +++ b/config/import-control.xml @@ -23,6 +23,7 @@ + diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java index 474e7380ce8..20630ea0be9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/DetailAstImpl.java @@ -23,6 +23,7 @@ import java.util.List; import org.antlr.v4.runtime.Token; +import org.checkerframework.checker.index.qual.NonNegative; import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.utils.TokenUtil; @@ -383,7 +384,7 @@ private BitSet getBranchTokenTypes() { } @Override - public boolean branchContains(int tokenType) { + public boolean branchContains(@NonNegative int tokenType) { return getBranchTokenTypes().get(tokenType); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java index e803762975f..d261af33884 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/DetailAST.java @@ -19,6 +19,8 @@ package com.puppycrawl.tools.checkstyle.api; +import org.checkerframework.checker.index.qual.NonNegative; + /** * An interface of Checkstyle's AST nodes for traversing trees generated from the * Java code. The main purpose of this interface is to abstract away ANTLR @@ -105,7 +107,7 @@ public interface DetailAST { * for more details. */ @Deprecated(since = "8.43") - boolean branchContains(int type); + boolean branchContains(@NonNegative int type); /** * Returns the previous sibling or null if no such sibling exists.