Scripting, minor: updateScriptDefinitions -> updateScriptDefinitionReferences

This commit is contained in:
Sergey Rostov
2020-05-07 16:38:44 +03:00
parent 0d6c7f2b41
commit 5474d55795
5 changed files with 4 additions and 13 deletions
@@ -90,9 +90,9 @@ interface ScriptConfigurationManager {
fun isConfigurationLoadingInProgress(file: KtFile): Boolean
/**
* Clear all caches and re-highlighting opened scripts
* Update caches that depends on script definitions and do update if necessary
*/
fun updateScriptDefinitions()
fun updateScriptDefinitionReferences()
///////////////
// classpath roots info:
@@ -197,7 +197,7 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
scriptDefinitionsCacheLock.withLock { scriptDefinitionsCache.clear() }
// TODO: clear by script type/definition
ScriptConfigurationManager.getInstance(project).updateScriptDefinitions()
ScriptConfigurationManager.getInstance(project).updateScriptDefinitionReferences()
}
private fun ScriptDefinitionsSource.safeGetDefinitions(): List<ScriptDefinition> {
@@ -100,16 +100,12 @@ class CompositeScriptConfigurationManager(val project: Project) : ScriptConfigur
return new.diff(old)
}
override fun updateScriptDefinitions() {
override fun updateScriptDefinitionReferences() {
ScriptDependenciesModificationTracker.getInstance(project).incModificationCount()
default.updateScriptDefinitions()
if (classpathRoots.customDefinitionsUsed) {
plugins.forEach {
it.updateScriptDefinitions()
}
updater.ensureUpdateScheduled()
}
}
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.psi.KtFile
abstract class ScriptingSupport {
abstract class Provider {
abstract fun updateScriptDefinitions()
abstract fun isApplicable(file: VirtualFile): Boolean
abstract fun isConfigurationLoadingInProgress(file: KtFile): Boolean
abstract fun collectConfigurations(builder: ScriptClassRootsCache.Builder)
@@ -68,10 +68,6 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport.Provider(
////////////
/// ScriptingSupport.Provider implementation:
override fun updateScriptDefinitions() {
// nothing related to script definition and project roots are cached
}
override fun isApplicable(file: VirtualFile): Boolean {
val scriptUnderRoot = findScriptBuildRoot(file) ?: return false
if (scriptUnderRoot.root is GradleBuildRoot.Legacy) return false