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

Minor: changes after review

Browse Source
This commit is contained in:
Sergey Rostov
2019-11-13 11:45:43 +03:00
committed by Natalia Selezneva
parent fc100d13dd
commit 75a23b4bc4
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/DefaultScriptConfigurationManager.kt
+16 -13
View File
@@ -18,6 +18,7 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.jetbrains.kotlin.idea.core.script.*
import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManagerExtensions.LOADER
import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManagerExtensions.LISTENER
import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationFileAttributeCache
import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationMemoryCache
import org.jetbrains.kotlin.idea.core.script.configuration.cache.ScriptConfigurationSnapshot
@@ -107,18 +108,23 @@ internal class DefaultScriptConfigurationManager(project: Project) :
if (ApplicationManager.getApplication().isUnitTestMode) TestingBackgroundExecutor(rootsIndexer)
else DefaultBackgroundExecutor(project, rootsIndexer)
private val outsiderLoader = ScriptOutsiderFileConfigurationLoader(project)
private val fileAttributeCache = ScriptConfigurationFileAttributeCache(project)
private val defaultLoader = DefaultScriptConfigurationLoader(project)
private val loaders: Sequence<ScriptConfigurationLoader>
get() = sequence {
yield(outsiderLoader)
yield(fileAttributeCache)
yieldAll(LOADER.getPoint(project).extensionList)
yield(defaultLoader)
}
private val loaders: List<ScriptConfigurationLoader>
get() = listOf(
ScriptOutsiderFileConfigurationLoader(project),
ScriptConfigurationFileAttributeCache(project)
) + project[LOADER] + listOf(
DefaultScriptConfigurationLoader(project)
)
private val listeners: List<ScriptChangeListener>
get() = project[DefaultScriptConfigurationManagerExtensions.LISTENER] + listOf(DefaultScriptChangeListener())
private val defaultListener = DefaultScriptChangeListener()
private val listeners: Sequence<ScriptChangeListener>
get() = sequence {
yieldAll(LISTENER.getPoint(project).extensionList)
yield(defaultListener)
}
private val notifier = ScriptChangesNotifier(project, updater, listeners)
@@ -131,9 +137,6 @@ internal class DefaultScriptConfigurationManager(project: Project) :
}
}
private operator fun <T> Project.get(epName: ExtensionPointName<T>): List<T> =
Extensions.getArea(this).getExtensionPoint(epName).extensionList
/**
* Will be called on [cache] miss to initiate loading of [file]'s script configuration.
*
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangesNotifier.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.scripting.definitions.isNonScript
internal class ScriptChangesNotifier(
private val project: Project,
private val updater: ScriptConfigurationUpdater,
private val listeners: List<ScriptChangeListener>
private val listeners: Sequence<ScriptChangeListener>
) {
private val scriptsQueue = Alarm(Alarm.ThreadToUse.SWING_THREAD, project)
private val scriptChangesListenerDelay = 1400