diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/Analyzer.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/Analyzer.kt index f66bfd58b02e..f4997fbc695c 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/Analyzer.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/Analyzer.kt @@ -14,13 +14,13 @@ import io.gitlab.arturbosch.detekt.api.Rule import io.gitlab.arturbosch.detekt.api.RuleSet import io.gitlab.arturbosch.detekt.api.RuleSetProvider import io.gitlab.arturbosch.detekt.api.Severity -import io.gitlab.arturbosch.detekt.api.internal.isSuppressedBy import io.gitlab.arturbosch.detekt.api.internal.whichDetekt import io.gitlab.arturbosch.detekt.api.internal.whichJava import io.gitlab.arturbosch.detekt.api.internal.whichOS import io.gitlab.arturbosch.detekt.api.ruleId import io.gitlab.arturbosch.detekt.core.rules.associateRuleIdsToRuleSetIds import io.gitlab.arturbosch.detekt.core.suppressors.buildSuppressors +import io.gitlab.arturbosch.detekt.core.suppressors.isSuppressedBy import io.gitlab.arturbosch.detekt.core.util.isActiveOrDefault import io.gitlab.arturbosch.detekt.core.util.shouldAnalyzeFile import org.jetbrains.kotlin.config.languageVersionSettings diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Suppressions.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressions.kt similarity index 92% rename from detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Suppressions.kt rename to detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressions.kt index e3ebf46eb9e3..1a97c15d5e99 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Suppressions.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressions.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.api.internal +package io.gitlab.arturbosch.detekt.core.suppressors import io.gitlab.arturbosch.detekt.api.Rule import io.gitlab.arturbosch.detekt.api.RuleSet @@ -42,7 +42,7 @@ private val suppressionAnnotations = setOf("Suppress", "SuppressWarnings") /** * Checks if this kt element is suppressed by @Suppress or @SuppressWarnings annotations. */ -fun KtAnnotated.isSuppressedBy(id: Rule.Id, aliases: Set, ruleSetId: RuleSet.Id? = null): Boolean { +private fun KtAnnotated.isSuppressedBy(id: Rule.Id, aliases: Set, ruleSetId: RuleSet.Id? = null): Boolean { val acceptedSuppressionIds = mutableSetOf(id.value, "ALL", "all", "All") if (ruleSetId != null) { acceptedSuppressionIds.addAll(listOf(ruleSetId.value, "$ruleSetId.$id", "$ruleSetId:$id")) diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/SuppressionSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/SuppressionsSpec.kt similarity index 98% rename from detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/SuppressionSpec.kt rename to detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/SuppressionsSpec.kt index d01e4b65bc64..f1f27a663a3f 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/SuppressionSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/SuppressionsSpec.kt @@ -1,4 +1,4 @@ -package io.gitlab.arturbosch.detekt.core +package io.gitlab.arturbosch.detekt.core.suppressors import io.github.detekt.test.utils.compileContentForTest import io.github.detekt.test.utils.compileForTest @@ -8,7 +8,6 @@ import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.Entity import io.gitlab.arturbosch.detekt.api.Location import io.gitlab.arturbosch.detekt.api.Rule -import io.gitlab.arturbosch.detekt.api.internal.isSuppressedBy import io.gitlab.arturbosch.detekt.test.lint import io.gitlab.arturbosch.detekt.test.yamlConfigFromContent import org.assertj.core.api.Assertions.assertThat @@ -20,7 +19,7 @@ import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -class SuppressionSpec { +class SuppressionsSpec { @Nested inner class `detekt findings can be suppressed with @Suppress or @SuppressWarnings` {