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

Normalize virtual file paths to prevent duplicate sources

Browse Source 
#KT-52465 Fixed
This commit is contained in:
Alexander Udalov
2022-05-25 08:54:51 +02:00
parent e25dee558f
commit a7f4981fe5
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt
+4 -3
View File
@@ -44,7 +44,8 @@ inline fun List<KotlinSourceRoot>.forAllFiles(
val virtualFileCreator = PreprocessedFileCreator(project)
for ((sourceRootPath, isCommon) in this) {
val vFile = localFileSystem.findFileByPath(sourceRootPath)
val sourceRoot = File(sourceRootPath)
val vFile = localFileSystem.findFileByPath(sourceRoot.normalize().path)
if (vFile == null) {
val message = "Source file or directory not found: $sourceRootPath"
@@ -63,10 +64,10 @@ inline fun List<KotlinSourceRoot>.forAllFiles(
continue
}
for (file in File(sourceRootPath).walkTopDown()) {
for (file in sourceRoot.walkTopDown()) {
if (!file.isFile) continue
val virtualFile = localFileSystem.findFileByPath(file.absolutePath)?.let(virtualFileCreator::create)
val virtualFile = localFileSystem.findFileByPath(file.absoluteFile.normalize().path)?.let(virtualFileCreator::create)
if (virtualFile != null && processedFiles.add(virtualFile)) {
body(virtualFile, isCommon)
}