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

ScriptDependenciesUpdater: compute script contents synchronously

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-07-18 16:04:01 +03:00
parent 9eb8cec5cf
commit eb5be038fa
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+4 -12
View File
@@ -153,25 +153,17 @@ internal class ScriptDependenciesUpdater(
} }
val dependenciesResolver = scriptDef.dependencyResolver val dependenciesResolver = scriptDef.dependencyResolver
val scriptContents = contentLoader.getScriptContents(scriptDef, file)
val environment = contentLoader.getEnvironment(scriptDef)
val newJob = if (dependenciesResolver is AsyncDependenciesResolver) { val newJob = if (dependenciesResolver is AsyncDependenciesResolver) {
launch(asyncUpdatesDispatcher) { launch(asyncUpdatesDispatcher) {
process( process(dependenciesResolver.resolveAsync(scriptContents, environment))
dependenciesResolver.resolveAsync(
contentLoader.getScriptContents(scriptDef, file),
contentLoader.getEnvironment(scriptDef)
)
)
} }
} }
else { else {
assert(dependenciesResolver is LegacyResolverWrapper) assert(dependenciesResolver is LegacyResolverWrapper)
launch(legacyUpdatesDispatcher) { launch(legacyUpdatesDispatcher) {
process( process(dependenciesResolver.resolve(scriptContents, environment))
dependenciesResolver.resolve(
contentLoader.getScriptContents(scriptDef, file),
contentLoader.getEnvironment(scriptDef)
)
)
} }
} }
return TimeStampedJob(newJob, currentTimeStamp) return TimeStampedJob(newJob, currentTimeStamp)