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

Specify root type in non-existent location warning

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-06-20 00:19:11 +03:00
parent 3fb26d92df
commit 32b1c42647
1 changed files with 12 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
+12 -9
View File
@@ -353,22 +353,25 @@ class KotlinCoreEnvironment private constructor(
}.orEmpty() }.orEmpty()
} }
private fun contentRootToVirtualFile(root: JvmContentRoot): VirtualFile? { private fun contentRootToVirtualFile(root: JvmContentRoot): VirtualFile? =
return when (root) { when (root) {
is JvmClasspathRoot -> if (root.file.isFile) findJarRoot(root.file) else findLocalFile(root) is JvmClasspathRoot ->
is JvmModulePathRoot -> if (root.file.isFile) findJarRoot(root.file) else findLocalFile(root) if (root.file.isFile) findJarRoot(root.file) else findExistingRoot(root, "Classpath entry")
is JavaSourceRoot -> findLocalFile(root) is JvmModulePathRoot ->
else -> throw IllegalStateException("Unexpected root: $root") if (root.file.isFile) findJarRoot(root.file) else findExistingRoot(root, "Java module root")
is JavaSourceRoot ->
findExistingRoot(root, "Java source root")
else ->
throw IllegalStateException("Unexpected root: $root")
} }
}
internal fun findLocalFile(path: String): VirtualFile? = internal fun findLocalFile(path: String): VirtualFile? =
applicationEnvironment.localFileSystem.findFileByPath(path) applicationEnvironment.localFileSystem.findFileByPath(path)
private fun findLocalFile(root: JvmContentRoot): VirtualFile? { private fun findExistingRoot(root: JvmContentRoot, rootDescription: String): VirtualFile? {
return findLocalFile(root.file.absolutePath).also { return findLocalFile(root.file.absolutePath).also {
if (it == null) { if (it == null) {
report(STRONG_WARNING, "Classpath entry points to a non-existent location: ${root.file}") report(STRONG_WARNING, "$rootDescription points to a non-existent location: ${root.file}")
} }
} }
} }