From dbdf6802bff97de680ad6bc2a895643e1f977e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brais=20Gab=C3=ADn?= Date: Sun, 14 Jan 2024 01:29:48 +0100 Subject: [PATCH] Remove createPathFilters from detekt-tooling --- .../arturbosch/detekt/core/util/ConfigExtensions.kt | 8 +++++++- detekt-tooling/api/detekt-tooling.api | 4 ---- .../kotlin/io/github/detekt/tooling/api/PathFilters.kt | 7 ------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt index 73854ec21f9..4bf72c032b0 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/ConfigExtensions.kt @@ -1,6 +1,6 @@ package io.gitlab.arturbosch.detekt.core.util -import io.github.detekt.tooling.api.createPathFilters +import io.github.detekt.tooling.api.PathFilters import io.gitlab.arturbosch.detekt.api.Config import org.jetbrains.kotlin.psi.KtFile @@ -10,3 +10,9 @@ internal fun Config.shouldAnalyzeFile(file: KtFile): Boolean { val filters = createPathFilters() return filters == null || !filters.isIgnored(file) } + +private fun Config.createPathFilters(): PathFilters? { + val includes = valueOrDefault(Config.INCLUDES_KEY, emptyList()) + val excludes = valueOrDefault(Config.EXCLUDES_KEY, emptyList()) + return PathFilters.of(includes, excludes) +} diff --git a/detekt-tooling/api/detekt-tooling.api b/detekt-tooling/api/detekt-tooling.api index 85c038e8b6c..a834743afb7 100644 --- a/detekt-tooling/api/detekt-tooling.api +++ b/detekt-tooling/api/detekt-tooling.api @@ -103,10 +103,6 @@ public final class io/github/detekt/tooling/api/PathFilters$Companion { public final fun of (Ljava/util/List;Ljava/util/List;)Lio/github/detekt/tooling/api/PathFilters; } -public final class io/github/detekt/tooling/api/PathFiltersKt { - public static final fun createPathFilters (Lio/gitlab/arturbosch/detekt/api/Config;)Lio/github/detekt/tooling/api/PathFilters; -} - public final class io/github/detekt/tooling/api/UnexpectedError : io/github/detekt/tooling/api/DetektError { public fun (Ljava/lang/Throwable;)V public fun getCause ()Ljava/lang/Throwable; diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/PathFilters.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/PathFilters.kt index 3206c964ba5..e30221e747a 100644 --- a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/PathFilters.kt +++ b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/PathFilters.kt @@ -2,7 +2,6 @@ package io.github.detekt.tooling.api import io.github.detekt.psi.absolutePath import io.github.detekt.psi.basePath -import io.gitlab.arturbosch.detekt.api.Config import org.jetbrains.kotlin.psi.KtFile import java.nio.file.Path import java.nio.file.PathMatcher @@ -63,9 +62,3 @@ class PathFilters internal constructor( } } } - -fun Config.createPathFilters(): PathFilters? { - val includes = valueOrDefault(Config.INCLUDES_KEY, emptyList()) - val excludes = valueOrDefault(Config.EXCLUDES_KEY, emptyList()) - return PathFilters.of(includes, excludes) -}