Minor: extract ScriptContentLoader::getEnvironment
This commit is contained in:
@@ -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()
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user