Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 8, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion detekt-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {

dependencies {
api(libs.kotlin.compilerEmbeddable)
api(projects.detektPsiUtils)
implementation(projects.detektUtils)

testImplementation(projects.detektTest)
Expand Down
9 changes: 7 additions & 2 deletions detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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)
)
}

/**
Expand Down
1 change: 1 addition & 0 deletions detekt-formatting/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
1 change: 1 addition & 0 deletions detekt-generator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 2 additions & 0 deletions detekt-metrics/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
1 change: 1 addition & 0 deletions detekt-rules-complexity/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektMetrics)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektMetrics)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
Expand Down
1 change: 1 addition & 0 deletions detekt-rules-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
testRuntimeOnly(libs.kotlinx.coroutines)
Expand Down
1 change: 1 addition & 0 deletions detekt-rules-documentation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
1 change: 1 addition & 0 deletions detekt-rules-empty/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
1 change: 1 addition & 0 deletions detekt-rules-errorprone/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
implementation(projects.detektTooling)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
Expand Down
1 change: 1 addition & 0 deletions detekt-rules-exceptions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
1 change: 1 addition & 0 deletions detekt-rules-libraries/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
dependencies {
compileOnly(kotlin("stdlib-jdk8"))
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
Expand Down
1 change: 1 addition & 0 deletions detekt-rules-naming/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {

dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
1 change: 1 addition & 0 deletions detekt-rules-ruleauthors/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
dependencies {
compileOnly(kotlin("stdlib-jdk8"))
compileOnly(projects.detektApi)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
}
Expand Down
1 change: 1 addition & 0 deletions detekt-rules-style/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
dependencies {
compileOnly(projects.detektApi)
compileOnly(projects.detektMetrics)
compileOnly(projects.detektPsiUtils)
testImplementation(projects.detektMetrics)
testImplementation(projects.detektTest)
testImplementation(libs.assertj)
Expand Down