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

Move file utils

Browse Source 
Fixing IC after moving it from Gradle to the compiler in commit f40a3eff20
This commit is contained in:
Alexey Tsvetkov
2016-11-25 16:23:34 +03:00
parent 8bd8f5eacf
commit cbe680d876
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
-2
View File
@@ -255,8 +255,6 @@ fun <Target> mapClassesFqNamesToFiles(
return dirtyFiles return dirtyFiles
} }
private fun File.isJavaFile() = extension.equals(JavaFileType.INSTANCE.defaultExtension, ignoreCase = true)
private fun findSrcDirRoot(file: File, roots: Iterable<File>): File? = private fun findSrcDirRoot(file: File, roots: Iterable<File>): File? =
roots.firstOrNull { FileUtil.isAncestor(it, file, false) } roots.firstOrNull { FileUtil.isAncestor(it, file, false) }
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/fileUtils.kt → build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt
+3 -12
View File
@@ -18,23 +18,14 @@ package org.jetbrains.kotlin.incremental
import java.io.File import java.io.File
internal fun File.isJavaFile() = fun File.isJavaFile() =
extension.equals("java", ignoreCase = true) extension.equals("java", ignoreCase = true)
internal fun File.isKotlinFile(): Boolean = fun File.isKotlinFile(): Boolean =
extension.let { extension.let {
"kt".equals(it, ignoreCase = true) || "kt".equals(it, ignoreCase = true) ||
"kts".equals(it, ignoreCase = true) "kts".equals(it, ignoreCase = true)
} }
internal fun File.isClassFile(): Boolean = fun File.isClassFile(): Boolean =
extension.equals("class", ignoreCase = true) extension.equals("class", ignoreCase = true)
internal fun listClassFiles(path: String): Sequence<File> =
File(path).walk().filter { it.isFile && it.isClassFile() }
internal fun File.relativeOrCanonical(base: File): String =
relativeToOrNull(base)?.path ?: canonicalPath
internal fun Iterable<File>.pathsAsStringRelativeTo(base: File): String =
map { it.relativeOrCanonical(base) }.sorted().joinToString()