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

Do not warn on non-JAR files in classpath

Browse Source 
#KT-17140 Fixed
This commit is contained in:
Alexander Udalov
2017-03-29 17:51:09 +03:00
parent 64dfa6d33d
commit b368da8456
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+2 -9
View File
@@ -307,15 +307,8 @@ class KotlinCoreEnvironment private constructor(
internal fun findLocalDirectory(absolutePath: String): VirtualFile? = internal fun findLocalDirectory(absolutePath: String): VirtualFile? =
applicationEnvironment.localFileSystem.findFileByPath(absolutePath) applicationEnvironment.localFileSystem.findFileByPath(absolutePath)
private fun findJarRoot(root: JvmClasspathRoot): VirtualFile? { private fun findJarRoot(root: JvmClasspathRoot): VirtualFile? =
val path = root.file applicationEnvironment.jarFileSystem.findFileByPath("${root.file}${URLUtil.JAR_SEPARATOR}")
val jarFile = applicationEnvironment.jarFileSystem.findFileByPath("$path${URLUtil.JAR_SEPARATOR}")
if (jarFile == null) {
report(STRONG_WARNING, "Classpath entry points to a file that is not a JAR archive: $path")
return null
}
return jarFile
}
private fun getSourceRootsCheckingForDuplicates(): Collection<String> { private fun getSourceRootsCheckingForDuplicates(): Collection<String> {
val uniqueSourceRoots = Sets.newLinkedHashSet<String>() val uniqueSourceRoots = Sets.newLinkedHashSet<String>()