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

KotlinScriptConfigurationManager, minor: Extract utility to get transform list of file to vfs roots

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-07-14 17:02:16 +03:00
committed by Ilya Chernikov
parent 500554e58c
commit 350abbe8cd
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/KotlinScriptConfigurationManager.kt
+20 -15
View File
@@ -73,11 +73,11 @@ class KotlinScriptConfigurationManager(
private val cacheLock = ReentrantReadWriteLock() private val cacheLock = ReentrantReadWriteLock()
private val allScriptsClasspathCache = ClearableLazyValue(cacheLock) { private val allScriptsClasspathCache = ClearableLazyValue(cacheLock) {
scriptExternalImportsProvider.getKnownCombinedClasspath().distinct().mapNotNull { it.classpathEntryToVfs() } toVfsRoots(scriptExternalImportsProvider.getKnownCombinedClasspath().distinct())
} }
private val allLibrarySourcesCache = ClearableLazyValue(cacheLock) { private val allLibrarySourcesCache = ClearableLazyValue(cacheLock) {
scriptExternalImportsProvider.getKnownSourceRoots().distinct().mapNotNull { it.classpathEntryToVfs() } toVfsRoots(scriptExternalImportsProvider.getKnownSourceRoots().distinct())
} }
private fun notifyRootsChanged() { private fun notifyRootsChanged() {
@@ -86,24 +86,14 @@ class KotlinScriptConfigurationManager(
} }
} }
fun getScriptClasspath(file: VirtualFile): List<VirtualFile> = fun getScriptClasspath(file: VirtualFile): List<VirtualFile> = toVfsRoots(
scriptExternalImportsProvider.getExternalImports(file)?.classpath?.mapNotNull { it.classpathEntryToVfs() } ?: emptyList() scriptExternalImportsProvider.getExternalImports(file)?.classpath ?: emptyList()
)
fun getAllScriptsClasspath(): List<VirtualFile> = allScriptsClasspathCache.get() fun getAllScriptsClasspath(): List<VirtualFile> = allScriptsClasspathCache.get()
fun getAllLibrarySources(): List<VirtualFile> = allLibrarySourcesCache.get() fun getAllLibrarySources(): List<VirtualFile> = allLibrarySourcesCache.get()
private fun File.classpathEntryToVfs(): VirtualFile? {
val res = when {
!exists() -> null
isDirectory -> StandardFileSystems.local()?.findFileByPath(this.canonicalPath) ?: null
isFile -> StandardFileSystems.jar()?.findFileByPath(this.canonicalPath + URLUtil.JAR_SEPARATOR) ?: null
else -> null
}
// TODO: report this somewhere, but do not throw: assert(res != null, { "Invalid classpath entry '$this': exists: ${exists()}, is directory: $isDirectory, is file: $isFile" })
return res
}
fun getAllScriptsClasspathScope() = NonClasspathDirectoriesScope(getAllScriptsClasspath()) fun getAllScriptsClasspathScope() = NonClasspathDirectoriesScope(getAllScriptsClasspath())
fun getAllLibrarySourcesScope() = NonClasspathDirectoriesScope(getAllLibrarySources()) fun getAllLibrarySourcesScope() = NonClasspathDirectoriesScope(getAllLibrarySources())
@@ -145,6 +135,21 @@ class KotlinScriptConfigurationManager(
@JvmStatic @JvmStatic
fun getInstance(project: Project): KotlinScriptConfigurationManager = fun getInstance(project: Project): KotlinScriptConfigurationManager =
ServiceManager.getService(project, KotlinScriptConfigurationManager::class.java) ServiceManager.getService(project, KotlinScriptConfigurationManager::class.java)
fun toVfsRoots(roots: Iterable<File>): List<VirtualFile> {
return roots.mapNotNull { it.classpathEntryToVfs() }
}
private fun File.classpathEntryToVfs(): VirtualFile? {
val res = when {
!exists() -> null
isDirectory -> StandardFileSystems.local()?.findFileByPath(this.canonicalPath) ?: null
isFile -> StandardFileSystems.jar()?.findFileByPath(this.canonicalPath + URLUtil.JAR_SEPARATOR) ?: null
else -> null
}
// TODO: report this somewhere, but do not throw: assert(res != null, { "Invalid classpath entry '$this': exists: ${exists()}, is directory: $isDirectory, is file: $isFile" })
return res
}
} }
} }