Remove detekt-psi-utils usage from detekt-api (#7260)

detekt · May 8, 2024 · bb6c458 · bb6c458
1 parent 2f5225d
commit bb6c458
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 3 deletions.
diff --git a/detekt-api/build.gradle.kts b/detekt-api/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 
 dependencies {
     api(libs.kotlin.compilerEmbeddable)
-    api(projects.detektPsiUtils)
     implementation(projects.detektUtils)
 
     testImplementation(projects.detektTest)

diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt
@@ -1,7 +1,6 @@
 package io.gitlab.arturbosch.detekt.api
 
 import dev.drewhamilton.poko.Poko
-import io.github.detekt.psi.absolutePath
 import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnInPsiFile
@@ -10,6 +9,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import java.nio.file.Path
+import kotlin.io.path.Path
 
 /**
  * Specifies a position within a source code fragment.
@@ -37,7 +37,12 @@ class Location(
             val end = endLineAndColumn(element, offset)
             val endSourceLocation = SourceLocation(end.line, end.column)
             val textLocation = TextLocation(element.startOffset + offset, element.endOffset + offset)
-            return Location(sourceLocation, endSourceLocation, textLocation, element.containingFile.absolutePath())
+            return Location(
+                sourceLocation,
+                endSourceLocation,
+                textLocation,
+                Path((element.containingFile as KtFile).virtualFilePath)
+            )
         }
 
         /**

diff --git a/detekt-formatting/build.gradle.kts b/detekt-formatting/build.gradle.kts
@@ -6,6 +6,7 @@ val extraDepsToPackage: Configuration by configurations.creating
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     implementation(libs.ktlintRulesetStandard) {
         exclude(group = "org.jetbrains.kotlin")
     }

diff --git a/detekt-generator/build.gradle.kts b/detekt-generator/build.gradle.kts
@@ -16,6 +16,7 @@ val generatedUsageOutput by configurations.resolvable("generatedUsageOutput") {
 dependencies {
     implementation(projects.detektParser)
     implementation(projects.detektApi)
+    implementation(projects.detektPsiUtils)
     generatedUsage(projects.detektCli) {
         targetConfiguration = "generatedCliUsage"
     }

diff --git a/detekt-metrics/build.gradle.kts b/detekt-metrics/build.gradle.kts
@@ -4,7 +4,9 @@ plugins {
 
 dependencies {
     api(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTestUtils)
     testImplementation(testFixtures(projects.detektApi))
     testImplementation(libs.assertj)
+    testRuntimeOnly(projects.detektPsiUtils)
 }
diff --git a/detekt-rules-complexity/build.gradle.kts b/detekt-rules-complexity/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     compileOnly(projects.detektApi)
     compileOnly(projects.detektMetrics)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektMetrics)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)

diff --git a/detekt-rules-coroutines/build.gradle.kts b/detekt-rules-coroutines/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
     testRuntimeOnly(libs.kotlinx.coroutines)

diff --git a/detekt-rules-documentation/build.gradle.kts b/detekt-rules-documentation/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }
diff --git a/detekt-rules-empty/build.gradle.kts b/detekt-rules-empty/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }
diff --git a/detekt-rules-errorprone/build.gradle.kts b/detekt-rules-errorprone/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     implementation(projects.detektTooling)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)

diff --git a/detekt-rules-exceptions/build.gradle.kts b/detekt-rules-exceptions/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }
diff --git a/detekt-rules-libraries/build.gradle.kts b/detekt-rules-libraries/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     compileOnly(kotlin("stdlib-jdk8"))
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }

diff --git a/detekt-rules-naming/build.gradle.kts b/detekt-rules-naming/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }
diff --git a/detekt-rules-ruleauthors/build.gradle.kts b/detekt-rules-ruleauthors/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     compileOnly(kotlin("stdlib-jdk8"))
     compileOnly(projects.detektApi)
+    compileOnly(projects.detektPsiUtils)
     testImplementation(projects.detektTest)
     testImplementation(libs.assertj)
 }

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