azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call File.getCanonicalPath in KGP

Browse Source 
Relates to KT-54579.
This commit is contained in:
Andrey Uskov
2022-11-23 16:41:21 +03:00
committed by teamcity
parent ca8f234f28
commit 41ff283856
27 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt
+1 -1
View File
@@ -126,7 +126,7 @@ class FileAgeComparator : Comparator<File> {
leftTS == 0L || rightTS == 0L -> 0 // cannot read any file timestamp, => undecidable
leftTS > rightTS -> -1
leftTS < rightTS -> 1
else -> compareValues(left.canonicalPath, right.canonicalPath)
else -> compareValues(left.normalize().absolutePath, right.normalize().absolutePath)
}
}
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+1 -1
View File
@@ -1063,7 +1063,7 @@ class CompileServiceImpl(
}
daemon.scheduleShutdown(true)
} catch (e: Throwable) {
log.info("Cannot connect to a daemon, assuming dying ('${runFile.canonicalPath}'): ${e.message}")
log.info("Cannot connect to a daemon, assuming dying ('${runFile.normalize().absolutePath}'): ${e.message}")
}
}
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/experimental/CompileServiceServerSideImpl.kt
+1 -1
View File
@@ -527,7 +527,7 @@ class CompileServiceServerSideImpl(
daemon.scheduleShutdown(true)
log.fine("other : SHUTDOWN_OK")
} catch (e: Throwable) {
log.info("Cannot connect to a daemon, assuming dying ('${runFile.canonicalPath}'): ${e.message}")
log.info("Cannot connect to a daemon, assuming dying ('${runFile.normalize().absolutePath}'): ${e.message}")
}
}
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt
+1 -1
View File
@@ -37,7 +37,7 @@ class BuildReportICReporter(
icLogLines.add("Compile iteration:")
for (file in sourceFiles) {
val reason = recompilationReason[file]?.let { " <- $it" } ?: ""
icLogLines.add(" ${file.relativeOrCanonical()}$reason")
icLogLines.add(" ${file.relativeOrAbsolute()}$reason")
}
recompilationReason.clear()
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt
+1 -1
View File
@@ -80,7 +80,7 @@ internal class BuildReportICReporterAsync(
icLogLines.add("Compile iteration:")
for (file in sourceFiles) {
val reason = recompilationReason[file]?.let { " <- $it" } ?: ""
icLogLines.add(" ${file.relativeOrCanonical()}$reason")
icLogLines.add(" ${file.relativeOrAbsolute()}$reason")
}
recompilationReason.clear()
}
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
+1 -1
View File
@@ -435,7 +435,7 @@ abstract class IncrementalCompilerRunner<
dirtySources.addAll(compiledSources)
allDirtySources.addAll(dirtySources)
val text = allDirtySources.joinToString(separator = System.getProperty("line.separator")) { it.canonicalPath }
val text = allDirtySources.joinToString(separator = System.getProperty("line.separator")) { it.normalize().absolutePath }
dirtySourcesSinceLastTimeFile.writeText(text)
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotExternalizer.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import java.io.File
object FileSnapshotExternalizer : DataExternalizer<FileSnapshot> {
override fun save(out: DataOutput, value: FileSnapshot) {
out.writeUTF(value.file.canonicalPath)
out.writeUTF(value.file.normalize().absolutePath)
out.writeLong(value.length)
out.writeInt(value.hash.size)
out.write(value.hash)