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

ScriptClassRootsCache: load configuration if it is not cached

Browse Source
This commit is contained in:
Sergey Rostov
2019-11-13 10:34:43 +03:00
parent a84e948051
commit b4185c9d47
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/AbstractScriptConfigurationManager.kt
+7 -1
View File
@@ -254,12 +254,18 @@ internal abstract class AbstractScriptConfigurationManager(
val value2 = _classpathRoots val value2 = _classpathRoots
if (value2 != null) return value2 if (value2 != null) return value2
val value3 = ScriptClassRootsCache(project, cache) val value3 = newClassRootsCache()
_classpathRoots = value3 _classpathRoots = value3
return value3 return value3
} }
} }
private fun newClassRootsCache() = object : ScriptClassRootsCache(project) {
override val all get() = cache.allApplied()
override fun getConfiguration(file: VirtualFile) =
this@AbstractScriptConfigurationManager.getConfiguration(file)
}
private fun clearClassRootsCaches() { private fun clearClassRootsCaches() {
debug { "class roots caches cleared" } debug { "class roots caches cleared" }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsCache.kt
+3 -7
View File
@@ -17,16 +17,12 @@ import com.intellij.psi.search.NonClasspathDirectoriesScope
import com.intellij.util.containers.ConcurrentFactoryMap import com.intellij.util.containers.ConcurrentFactoryMap
import org.jetbrains.kotlin.idea.caches.project.getAllProjectSdks import org.jetbrains.kotlin.idea.caches.project.getAllProjectSdks
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationCache
import org.jetbrains.kotlin.idea.core.script.debug import org.jetbrains.kotlin.idea.core.script.debug
import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper
internal class ScriptClassRootsCache( internal abstract class ScriptClassRootsCache(private val project: Project) {
private val project: Project, protected abstract val all: Collection<Pair<VirtualFile, ScriptCompilationConfigurationWrapper>>
private val cache: ScriptConfigurationCache protected abstract fun getConfiguration(file: VirtualFile): ScriptCompilationConfigurationWrapper?
) {
private val all: Collection<Pair<VirtualFile, ScriptCompilationConfigurationWrapper>> get() = cache.allApplied()
private fun getConfiguration(file: VirtualFile): ScriptCompilationConfigurationWrapper? = cache[file]?.applied?.configuration
private fun getScriptSdk(compilationConfiguration: ScriptCompilationConfigurationWrapper?): Sdk? { private fun getScriptSdk(compilationConfiguration: ScriptCompilationConfigurationWrapper?): Sdk? {
// workaround for mismatched gradle wrapper and plugin version // workaround for mismatched gradle wrapper and plugin version