Move classes to psi-utils (#7105)

* Move file to the correct module * Move AnnotationExcluder to psi-utils
detekt · Apr 6, 2024 · dc77d52 · dc77d52
1 parent 0f32dcd
commit dc77d52
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 30 deletions.
diff --git a/detekt-api/api/detekt-api.api b/detekt-api/api/detekt-api.api
@@ -2,11 +2,6 @@ public abstract interface annotation class io/gitlab/arturbosch/detekt/api/Activ
 	public abstract fun since ()Ljava/lang/String;
 }
 
-public final class io/gitlab/arturbosch/detekt/api/AnnotationExcluder {
-	public fun <init> (Lorg/jetbrains/kotlin/psi/KtFile;Ljava/util/List;Lorg/jetbrains/kotlin/resolve/BindingContext;)V
-	public final fun shouldExclude (Ljava/util/List;)Z
-}
-
 public class io/gitlab/arturbosch/detekt/api/CodeSmell : io/gitlab/arturbosch/detekt/api/Finding {
 	public fun <init> (Lio/gitlab/arturbosch/detekt/api/Entity;Ljava/lang/String;Ljava/util/List;)V
 	public synthetic fun <init> (Lio/gitlab/arturbosch/detekt/api/Entity;Ljava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V

diff --git a/...core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt b/...core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt
@@ -1,6 +1,6 @@
 package io.gitlab.arturbosch.detekt.core.suppressors
 
-import io.gitlab.arturbosch.detekt.api.AnnotationExcluder
+import io.github.detekt.psi.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.Rule
 import org.jetbrains.kotlin.psi.KtAnnotated
 import org.jetbrains.kotlin.psi.KtElement

diff --git a/...t-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt b/...t-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt
@@ -1,6 +1,6 @@
 package io.gitlab.arturbosch.detekt.core.suppressors
 
-import io.github.detekt.tooling.api.FunctionMatcher
+import io.github.detekt.psi.FunctionMatcher
 import io.gitlab.arturbosch.detekt.api.Rule
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtNamedFunction

diff --git a/detekt-psi-utils/api/detekt-psi-utils.api b/detekt-psi-utils/api/detekt-psi-utils.api
@@ -1,3 +1,8 @@
+public final class io/github/detekt/psi/AnnotationExcluder {
+	public fun <init> (Lorg/jetbrains/kotlin/psi/KtFile;Ljava/util/List;Lorg/jetbrains/kotlin/resolve/BindingContext;)V
+	public final fun shouldExclude (Ljava/util/List;)Z
+}
+
 public final class io/github/detekt/psi/FilePath {
 	public static final field Companion Lio/github/detekt/psi/FilePath$Companion;
 	public fun <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V
@@ -13,6 +18,16 @@ public final class io/github/detekt/psi/FilePath$Companion {
 	public final fun fromRelative (Ljava/nio/file/Path;Ljava/nio/file/Path;)Lio/github/detekt/psi/FilePath;
 }
 
+public abstract class io/github/detekt/psi/FunctionMatcher {
+	public static final field Companion Lio/github/detekt/psi/FunctionMatcher$Companion;
+	public abstract fun match (Lorg/jetbrains/kotlin/descriptors/CallableDescriptor;)Z
+	public abstract fun match (Lorg/jetbrains/kotlin/psi/KtNamedFunction;Lorg/jetbrains/kotlin/resolve/BindingContext;)Z
+}
+
+public final class io/github/detekt/psi/FunctionMatcher$Companion {
+	public final fun fromFunctionSignature (Ljava/lang/String;)Lio/github/detekt/psi/FunctionMatcher;
+}
+
 public final class io/github/detekt/psi/KeysKt {
 	public static final fun getBasePath (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;)Ljava/nio/file/Path;
 	public static final fun getLineSeparator (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;)Ljava/lang/String;

diff --git a/...turbosch/detekt/api/AnnotationExcluder.kt → ...o/github/detekt/psi/AnnotationExcluder.kt b/...turbosch/detekt/api/AnnotationExcluder.kt → ...o/github/detekt/psi/AnnotationExcluder.kt
@@ -1,4 +1,4 @@
-package io.gitlab.arturbosch.detekt.api
+package io.github.detekt.psi
 
 import io.github.detekt.psi.internal.FullQualifiedNameGuesser
 import io.gitlab.arturbosch.detekt.rules.fqNameOrNull

diff --git a/...hub/detekt/tooling/api/FunctionMatcher.kt → ...n/io/github/detekt/psi/FunctionMatcher.kt b/...hub/detekt/tooling/api/FunctionMatcher.kt → ...n/io/github/detekt/psi/FunctionMatcher.kt
@@ -1,4 +1,4 @@
-package io.github.detekt.tooling.api
+package io.github.detekt.psi
 
 import io.gitlab.arturbosch.detekt.rules.fqNameOrNull
 import org.jetbrains.kotlin.descriptors.CallableDescriptor

diff --git a/...osch/detekt/api/AnnotationExcluderSpec.kt → ...thub/detekt/psi/AnnotationExcluderSpec.kt b/...osch/detekt/api/AnnotationExcluderSpec.kt → ...thub/detekt/psi/AnnotationExcluderSpec.kt
@@ -1,4 +1,4 @@
-package io.gitlab.arturbosch.detekt.api
+package io.github.detekt.psi
 
 import io.github.detekt.test.utils.compileContentForTest
 import io.gitlab.arturbosch.detekt.rules.KotlinCoreEnvironmentTest

diff --git a/...detekt/tooling/api/FunctionMatcherSpec.kt → .../github/detekt/psi/FunctionMatcherSpec.kt b/...detekt/tooling/api/FunctionMatcherSpec.kt → .../github/detekt/psi/FunctionMatcherSpec.kt
@@ -1,4 +1,4 @@
-package io.github.detekt.tooling.api
+package io.github.detekt.psi
 
 import io.github.detekt.test.utils.compileContentForTest
 import io.gitlab.arturbosch.detekt.rules.KotlinCoreEnvironmentTest

diff --git a/...rc/test/resources/annotation_excluder.csv → ...rc/test/resources/annotation_excluder.csv b/...rc/test/resources/annotation_excluder.csv → ...rc/test/resources/annotation_excluder.csv
diff --git a/detekt-rules-complexity/build.gradle.kts b/detekt-rules-complexity/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 dependencies {
     compileOnly(projects.detektApi)
     compileOnly(projects.detektMetrics)
-    compileOnly(projects.detektTooling)
     testImplementation(projects.detektMetrics)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)

diff --git a/...plexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LongParameterList.kt b/...plexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LongParameterList.kt
@@ -1,7 +1,7 @@
 package io.gitlab.arturbosch.detekt.rules.complexity
 
+import io.github.detekt.psi.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.ActiveByDefault
-import io.gitlab.arturbosch.detekt.api.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.Configuration
 import io.gitlab.arturbosch.detekt.api.Entity

diff --git a/...xity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt b/...xity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt
@@ -1,6 +1,6 @@
 package io.gitlab.arturbosch.detekt.rules.complexity
 
-import io.github.detekt.tooling.api.FunctionMatcher
+import io.github.detekt.psi.FunctionMatcher
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.Configuration
 import io.gitlab.arturbosch.detekt.api.DetektVisitor

diff --git a/...s-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt b/...s-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt
@@ -1,6 +1,6 @@
 package io.gitlab.arturbosch.detekt.rules.bugs
 
-import io.github.detekt.tooling.api.FunctionMatcher
+import io.github.detekt.psi.FunctionMatcher
 import io.gitlab.arturbosch.detekt.api.ActiveByDefault
 import io.gitlab.arturbosch.detekt.api.CodeSmell
 import io.gitlab.arturbosch.detekt.api.Config

diff --git a/detekt-rules-style/build.gradle.kts b/detekt-rules-style/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 dependencies {
     compileOnly(projects.detektApi)
     compileOnly(projects.detektMetrics)
-    compileOnly(projects.detektTooling)
     testImplementation(projects.detektMetrics)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)

diff --git a/...rc/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/AbstractClassCanBeConcreteClass.kt b/...rc/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/AbstractClassCanBeConcreteClass.kt
@@ -1,7 +1,7 @@
 package io.gitlab.arturbosch.detekt.rules.style
 
+import io.github.detekt.psi.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.ActiveByDefault
-import io.gitlab.arturbosch.detekt.api.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.CodeSmell
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.Configuration

diff --git a/...ules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt b/...ules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt
@@ -1,7 +1,7 @@
 package io.gitlab.arturbosch.detekt.rules.style
 
-import io.github.detekt.tooling.api.FunctionMatcher
-import io.github.detekt.tooling.api.FunctionMatcher.Companion.fromFunctionSignature
+import io.github.detekt.psi.FunctionMatcher
+import io.github.detekt.psi.FunctionMatcher.Companion.fromFunctionSignature
 import io.gitlab.arturbosch.detekt.api.CodeSmell
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.Configuration

diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt
@@ -1,6 +1,6 @@
 package io.gitlab.arturbosch.detekt.rules.style
 
-import io.gitlab.arturbosch.detekt.api.AnnotationExcluder
+import io.github.detekt.psi.AnnotationExcluder
 import io.gitlab.arturbosch.detekt.api.CodeSmell
 import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.Configuration

diff --git a/detekt-tooling/api/detekt-tooling.api b/detekt-tooling/api/detekt-tooling.api
@@ -71,16 +71,6 @@ public final class io/github/detekt/tooling/api/DetektProvider$DefaultImpls {
 	public static fun getPriority (Lio/github/detekt/tooling/api/DetektProvider;)I
 }
 
-public abstract class io/github/detekt/tooling/api/FunctionMatcher {
-	public static final field Companion Lio/github/detekt/tooling/api/FunctionMatcher$Companion;
-	public abstract fun match (Lorg/jetbrains/kotlin/descriptors/CallableDescriptor;)Z
-	public abstract fun match (Lorg/jetbrains/kotlin/psi/KtNamedFunction;Lorg/jetbrains/kotlin/resolve/BindingContext;)Z
-}
-
-public final class io/github/detekt/tooling/api/FunctionMatcher$Companion {
-	public final fun fromFunctionSignature (Ljava/lang/String;)Lio/github/detekt/tooling/api/FunctionMatcher;
-}
-
 public final class io/github/detekt/tooling/api/InvalidConfig : io/github/detekt/tooling/api/DetektError {
 	public fun <init> (Ljava/lang/String;)V
 }