Remove psiFile.relativePath

detekt · May 5, 2024 · 689ca89 · 689ca89
1 parent cb3d8f5
commit 689ca89
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 13 deletions.
diff --git a/detekt-parser/src/main/kotlin/io/github/detekt/parser/KtCompiler.kt b/detekt-parser/src/main/kotlin/io/github/detekt/parser/KtCompiler.kt
@@ -2,7 +2,6 @@ package io.github.detekt.parser
 
 import io.github.detekt.psi.absolutePath
 import io.github.detekt.psi.lineSeparator
-import io.github.detekt.psi.relativePath
 import org.intellij.lang.annotations.Language
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtilRt
@@ -32,8 +31,6 @@ open class KtCompiler(
  val normalizedAbsolutePath = path.absolute().normalize()
  this.absolutePath = normalizedAbsolutePath
  this.lineSeparator = content.determineLineSeparator()
- val normalizedBasePath = basePath.absolute().normalize()
- this.relativePath = normalizedBasePath.relativize(normalizedAbsolutePath)
  }
  }
 }

diff --git a/detekt-parser/src/test/kotlin/io/github/detekt/parser/KtCompilerSpec.kt b/detekt-parser/src/test/kotlin/io/github/detekt/parser/KtCompilerSpec.kt
@@ -1,7 +1,6 @@
 package io.github.detekt.parser
 
 import io.github.detekt.psi.lineSeparator
-import io.github.detekt.psi.relativePath
 import io.github.detekt.test.utils.resourceAsPath
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
@@ -23,17 +22,13 @@ class KtCompilerSpec {
  val ktFile = ktCompiler.compile(path, path.resolve("DefaultLf.kt"))
 
  assertThat(ktFile.lineSeparator).isEqualTo("\n")
- assertThat(ktFile.relativePath)
- .isEqualTo(Path("DefaultLf.kt"))
  }
 
  @Test
  fun `Kotlin file with CRLF line separators has extra user data`() {
  val ktFile = ktCompiler.compile(path, path.resolve("DefaultCrLf.kt"))
 
  assertThat(ktFile.lineSeparator).isEqualTo("\r\n")
- assertThat(ktFile.relativePath)
- .isEqualTo(Path("DefaultCrLf.kt"))
  }
 
  @Test

diff --git a/detekt-psi-utils/api/detekt-psi-utils.api b/detekt-psi-utils/api/detekt-psi-utils.api
@@ -15,9 +15,7 @@ public final class io/github/detekt/psi/FunctionMatcher$Companion {
 
 public final class io/github/detekt/psi/KeysKt {
  public static final fun getLineSeparator (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;)Ljava/lang/String;
- public static final fun getRelativePath (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;)Ljava/nio/file/Path;
  public static final fun setLineSeparator (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;Ljava/lang/String;)V
- public static final fun setRelativePath (Lorg/jetbrains/kotlin/com/intellij/psi/PsiFile;Ljava/nio/file/Path;)V
 }
 
 public final class io/github/detekt/psi/KtFilesKt {

diff --git a/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/Keys.kt b/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/Keys.kt
@@ -3,8 +3,5 @@ package io.github.detekt.psi
 import org.jetbrains.kotlin.com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
-import org.jetbrains.kotlin.psi.UserDataProperty
-import java.nio.file.Path
 
-var PsiFile.relativePath: Path? by UserDataProperty(Key("relativePath"))
 var PsiFile.lineSeparator: String by NotNullableUserDataProperty(Key("lineSeparator"), System.lineSeparator())