Skip to content

Commit 68f2677

Browse files
committed
Kotlin: Add support for path transformers
1 parent 2eb9b61 commit 68f2677

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.github.codeql
22

33
import com.github.codeql.utils.versions.usesK2
44
import com.semmle.util.files.FileUtil
5+
import com.semmle.util.trap.pathtransformers.PathTransformer
56
import java.io.BufferedInputStream
67
import java.io.BufferedOutputStream
78
import java.io.BufferedReader
@@ -371,9 +372,9 @@ private fun doFile(
371372
context.clear()
372373
}
373374

374-
val srcFileRelativePath = srcFilePath.replace(':', '_')
375+
val srcFileRelativePath = PathTransformer.std().fileAsDatabaseString(File(srcFilePath))
375376

376-
val dbSrcFilePath = Paths.get("$dbSrcDir/$srcFileRelativePath")
377+
val dbSrcFilePath = FileUtil.appendAbsolutePath(dbSrcDir, srcFileRelativePath).toPath()
377378
val dbSrcDirPath = dbSrcFilePath.parent
378379
Files.createDirectories(dbSrcDirPath)
379380
val srcTmpFile =
@@ -385,7 +386,7 @@ private fun doFile(
385386
srcTmpFile.outputStream().use { Files.copy(Paths.get(srcFilePath), it) }
386387
srcTmpFile.renameTo(dbSrcFilePath.toFile())
387388

388-
val trapFileName = "$dbTrapDir/$srcFileRelativePath.trap"
389+
val trapFileName = FileUtil.appendAbsolutePath(dbTrapDir, "$srcFileRelativePath.trap").getAbsolutePath()
389390
val trapFileWriter = getTrapFileWriter(compression, logger, trapFileName)
390391

391392
if (checkTrapIdentical || !trapFileWriter.exists()) {

0 commit comments

Comments
 (0)