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

Rewrite handing and caching of script configurations

Browse Source 
The refactoring could enable lazy update of the index on script loading, but seems that makeRootsChange
call doesn't work as expected, therefore initial project scan is performed in the KotlinScriptConfigurationManager
anyway
This commit is contained in:
Ilya Chernikov
2016-06-01 12:41:37 +02:00
parent 3e6616de42
commit b9ea9513b1
9 changed files with 193 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+11 -10
View File
@@ -136,7 +136,7 @@ class KotlinCoreEnvironment private constructor(
})
KotlinScriptDefinitionProvider.getInstance(project).let { scriptDefinitionProvider ->
scriptDefinitionProvider.scriptDefinitions =
scriptDefinitionProvider.setScriptDefinitions(
configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS)
.ifEmpty {
if (configuration.get(JVMConfigurationKeys.LOAD_SCRIPT_CONFIGS) ?: false)
@@ -146,14 +146,14 @@ class KotlinCoreEnvironment private constructor(
}
else null
?: listOf(StandardScriptDefinition)
}
})
configuration.addJvmClasspathRoots(
sourceFiles
.mapNotNull { src -> src.virtualFile }
.flatMap { getScriptCombinedClasspath(it, project) }
.map { File(it).canonicalFile }
.distinct())
KotlinScriptExtraImportsProvider.getInstance(project)?.run {
configuration.addJvmClasspathRoots(
getCombinedClasspathFor(sourceFiles.mapNotNull { src -> src.virtualFile })
.map { File(it).canonicalFile }
.distinct())
}
}
fillClasspath(configuration)
@@ -409,8 +409,9 @@ class KotlinCoreEnvironment private constructor(
// made public for Upsource
@JvmStatic fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) {
with (projectEnvironment.project) {
registerService(KotlinScriptDefinitionProvider::class.java, KotlinScriptDefinitionProvider())
registerService(KotlinScriptExtraImportsProvider::class.java, KotlinScriptExtraImportsProvider(projectEnvironment.project))
val kotlinScriptDefinitionProvider = KotlinScriptDefinitionProvider()
registerService(KotlinScriptDefinitionProvider::class.java, kotlinScriptDefinitionProvider)
registerService(KotlinScriptExtraImportsProvider::class.java, KotlinScriptExtraImportsProvider(projectEnvironment.project, kotlinScriptDefinitionProvider))
registerService(KotlinJavaPsiFacade::class.java, KotlinJavaPsiFacade(this))
registerService(KtLightClassForFacade.FacadeStubCache::class.java, KtLightClassForFacade.FacadeStubCache(this))
}
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinConfigurableScriptDefinition.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
class KotlinConfigurableScriptDefinition(val config: KotlinScriptConfig, val environmentVars: Map<String, List<String>>?) : KotlinScriptDefinition {
data class KotlinConfigurableScriptDefinition(val config: KotlinScriptConfig, val environmentVars: Map<String, List<String>>?) : KotlinScriptDefinition {
override val name = config.name
override fun getScriptParameters(scriptDescriptor: ScriptDescriptor): List<ScriptParameter> =
config.parameters.map { ScriptParameter(Name.identifier(it.name), getKotlinTypeByFqName(scriptDescriptor, it.type)) }
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt
+1 -1
View File
@@ -43,7 +43,7 @@ interface KotlinScriptDefinition {
fun getScriptDependenciesClasspath(): List<String> = emptyList()
}
class ScriptParameter(val name: Name, val type: KotlinType)
data class ScriptParameter(val name: Name, val type: KotlinType)
object StandardScriptDefinition : KotlinScriptDefinition {
private val ARGS_NAME = Name.identifier("args")
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.kt
+22 -7
View File
@@ -19,23 +19,34 @@ package org.jetbrains.kotlin.script
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import java.util.*
import kotlin.concurrent.read
import kotlin.concurrent.write
class KotlinScriptDefinitionProvider {
private val definitions: MutableList<KotlinScriptDefinition> = arrayListOf(StandardScriptDefinition)
private val definitionsLock = java.util.concurrent.locks.ReentrantReadWriteLock()
private val notificationHandlers = ArrayList<() -> Unit>()
private val handlersLock = java.util.concurrent.locks.ReentrantReadWriteLock()
var scriptDefinitions: List<KotlinScriptDefinition>
get() = definitionsLock.read { definitions } // TODO: remove as unsafe with locking, replace with particular data extractors
set(definitions: List<KotlinScriptDefinition>) {
definitionsLock.write {
this.definitions.clear()
this.definitions.addAll(definitions)
fun setScriptDefinitions(newDefinitions: List<KotlinScriptDefinition>): Unit {
var changed = false
definitionsLock.read {
if (newDefinitions != definitions) {
definitionsLock.write {
definitions.clear()
definitions.addAll(newDefinitions)
}
changed = true
}
}
if (changed) {
handlersLock.read {
notificationHandlers.forEach { it() }
}
}
}
fun findScriptDefinition(file: VirtualFile?): KotlinScriptDefinition? = definitionsLock.read {
file?.let { file -> definitions.firstOrNull { it.isScript(file) } }
@@ -43,6 +54,10 @@ class KotlinScriptDefinitionProvider {
fun isScript(file: VirtualFile?): Boolean = findScriptDefinition(file) != null
fun subscribeOnDefinitionsChanged(handler: () -> Unit): Unit {
handlersLock.write { notificationHandlers.add(handler) }
}
fun addScriptDefinition(scriptDefinition: KotlinScriptDefinition) {
definitionsLock.write {
definitions.add(0, scriptDefinition)
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptExtraImportsProvider.kt
+76 -18
View File
@@ -19,34 +19,92 @@ package org.jetbrains.kotlin.script
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import java.lang.ref.WeakReference
import java.util.*
import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.read
import kotlin.concurrent.write
class KotlinScriptExtraImportsProvider(val project: Project) {
private val lock = ReentrantReadWriteLock()
class KotlinScriptExtraImportsProvider(val project: Project, private val scriptDefinitionProvider: KotlinScriptDefinitionProvider) {
private val cacheLock = ReentrantReadWriteLock()
private val cache = hashMapOf<VirtualFile, List<KotlinScriptExtraImport>>()
private val envVars: Map<String, List<String>> by lazy { generateKotlinScriptClasspathEnvVars(project) }
private val notificationHandlers = ArrayList<(Iterable<VirtualFile>) -> Unit>()
private val handlersLock = java.util.concurrent.locks.ReentrantReadWriteLock()
fun isExtraImportsConfig(file: VirtualFile): Boolean = file.name.endsWith(IMPORTSFILEEXTENSION)
fun getExtraImports(file: VirtualFile): List<KotlinScriptExtraImport> = lock.read {
if (file.isValid)
cache.getOrPut(file) {
file.parent.findFileByRelativePath(file.name + IMPORTSFILEEXTENSION)?.let {
loadScriptExtraImportConfigs(it.inputStream).map { KotlinScriptExtraImportFromConfig(it, envVars) }
}
?: emptyList()
}
else emptyList()
init {
val weakThis = WeakReference(this)
scriptDefinitionProvider.subscribeOnDefinitionsChanged { weakThis.get()?.invalidateAllExtraImports() }
}
fun invalidateExtraImports(importsFile: VirtualFile) {
importsFile.parent.findFileByRelativePath(importsFile.name.removeSuffix(IMPORTSFILEEXTENSION))?.let {
lock.write {
cache.remove(it)
fun isExtraImportsConfig(file: VirtualFile): Boolean = file.name.endsWith(IMPORTS_FILE_EXTENSION)
fun getExtraImports(vararg files: VirtualFile): List<KotlinScriptExtraImport> = getExtraImports(files.asIterable())
fun getExtraImports(files: Iterable<VirtualFile>): List<KotlinScriptExtraImport> {
val newCashedFiles = ArrayList<VirtualFile>()
val res = cacheLock.read {
files.flatMap { file ->
if (file.isValid && !file.isDirectory) {
cache[file]
?: scriptDefinitionProvider.findScriptDefinition(file)?.let { def ->
(listOf(KotlinScriptExtraImportFromDefinition(def)) +
(file.parent.findFileByRelativePath(file.name + IMPORTS_FILE_EXTENSION)?.let {
loadScriptExtraImportConfigs(it.inputStream).map { KotlinScriptExtraImportFromConfig(it, envVars) }
} ?: emptyList()))
.apply {
cacheLock.write { cache.put(file, this) }
newCashedFiles.add(file)
}
}
?: emptyList()
}
else emptyList()
}
}
notifyIfAny(newCashedFiles)
return res
}
fun invalidateExtraImportsByImportsFiles(importsFiles: Iterable<VirtualFile>) {
importsFiles.mapNotNull { it.parent.findFileByRelativePath(it.name.removeSuffix(IMPORTS_FILE_EXTENSION))?.let { file ->
cacheLock.write {
cache.remove(it)?.let { file }
}
} }.let {
notifyIfAny(it)
}
}
fun invalidateAllExtraImports() {
cacheLock.write {
cache.keys.toList().apply {
cache.clear()
}
}.let {
notifyIfAny(it)
}
}
private fun notifyIfAny(files: Iterable<VirtualFile>) {
if (files.any()) {
handlersLock.read {
notificationHandlers.forEach { it(files) }
}
}
}
fun getKnownCombinedClasspath(): List<String> = cacheLock.read {
cache.values.flatMap { it.flatMap { it.classpath } }
}.distinct()
fun getCombinedClasspathFor(files: Iterable<VirtualFile>): List<String> =
getExtraImports(files)
.flatMap { it.classpath }
.distinct()
fun subscribeOnExtraImportsChanged(handler: (Iterable<VirtualFile>) -> Unit): Unit {
handlersLock.write { notificationHandlers.add(handler) }
}
companion object {
@@ -54,6 +112,6 @@ class KotlinScriptExtraImportsProvider(val project: Project) {
fun getInstance(project: Project): KotlinScriptExtraImportsProvider? =
ServiceManager.getService(project, KotlinScriptExtraImportsProvider::class.java)
val IMPORTSFILEEXTENSION = ".ktsimports.xml"
val IMPORTS_FILE_EXTENSION = ".ktsimports.xml"
}
}
compiler/frontend/src/org/jetbrains/kotlin/script/getScriptDefinition.kt
-11
View File
@@ -34,14 +34,3 @@ fun getScriptExtraImports(psiFile: PsiFile): List<KotlinScriptExtraImport> =
KotlinScriptExtraImportsProvider.getInstance(psiFile.project)?.getExtraImports(file)
} ?: emptyList()
fun getScriptCombinedClasspath(file: VirtualFile, project: Project): List<String> =
getScriptDefinition(file, project)?.run {
getScriptDependenciesClasspath() +
getScriptExtraImports(file, project).flatMap { it.classpath }
} ?: emptyList()
fun getScriptCombinedClasspath(psiFile: PsiFile): List<String> =
getScriptDefinition(psiFile)?.run {
getScriptDependenciesClasspath() +
getScriptExtraImports(psiFile).flatMap { it.classpath }
} ?: emptyList()
compiler/frontend/src/org/jetbrains/kotlin/script/scriptConfig.kt
+5 -3
View File
@@ -68,11 +68,13 @@ fun generateSampleScriptConfig(): String {
}
@Tag("scriptParam")
class KotlinScriptParameterConfig(@Tag("name") var name: String = "",
@Tag("type") var type: String = "")
data class KotlinScriptParameterConfig(
@Tag("name") var name: String = "",
@Tag("type") var type: String = ""
)
@Tag("script")
class KotlinScriptConfig(
data class KotlinScriptConfig(
@Tag("name")
var name: String = "KotlinScript",
compiler/frontend/src/org/jetbrains/kotlin/script/scriptExtraImports.kt
+4
View File
@@ -61,3 +61,7 @@ class KotlinScriptExtraImportFromConfig(val config : KotlinScriptExtraImportConf
get() = config.names
}
class KotlinScriptExtraImportFromDefinition(val scriptDefinition: KotlinScriptDefinition) : KotlinScriptExtraImport {
override val classpath: List<String> get() = scriptDefinition.getScriptDependenciesClasspath()
override val names: List<String> = emptyList()
}