Minor: extract ScriptContentLoader::getEnvironment

This commit is contained in:
Pavel V. Talanov
2017-07-14 19:49:41 +03:00
parent 42629d6f8d
commit c0e08c61ee
2 changed files with 5 additions and 2 deletions
@@ -64,10 +64,13 @@ class ScriptContentLoader(private val project: Project) {
val scriptContents = getScriptContents(scriptDef, file)
val result = scriptDef.dependencyResolver.resolve(
scriptContents,
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment ?: emptyMap()
getEnvironment(scriptDef)
)
ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
return result.dependencies
}
fun getEnvironment(scriptDef: KotlinScriptDefinition) =
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
}
@@ -141,7 +141,7 @@ internal class ScriptDependenciesUpdater(
val newJob = launch(scriptDependencyUpdatesDispatcher) {
val result = dependenciesResolver.resolveAsync(
contentLoader.getScriptContents(scriptDef, file),
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
contentLoader.getEnvironment(scriptDef)
)
val lastTimeStamp = requests[path]?.request?.timeStamp
val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp