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

Minor: extract ScriptContentLoader::getEnvironment

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt
+4 -1
View File
@@ -64,10 +64,13 @@ class ScriptContentLoader(private val project: Project) {
val scriptContents = getScriptContents(scriptDef, file) val scriptContents = getScriptContents(scriptDef, file)
val result = scriptDef.dependencyResolver.resolve( val result = scriptDef.dependencyResolver.resolve(
scriptContents, scriptContents,
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment ?: emptyMap() getEnvironment(scriptDef)
) )
ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports) ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
return result.dependencies return result.dependencies
} }
fun getEnvironment(scriptDef: KotlinScriptDefinition) =
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty()
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+1 -1
View File
@@ -141,7 +141,7 @@ internal class ScriptDependenciesUpdater(
val newJob = launch(scriptDependencyUpdatesDispatcher) { val newJob = launch(scriptDependencyUpdatesDispatcher) {
val result = dependenciesResolver.resolveAsync( val result = dependenciesResolver.resolveAsync(
contentLoader.getScriptContents(scriptDef, file), contentLoader.getScriptContents(scriptDef, file),
(scriptDef as? KotlinScriptDefinitionFromAnnotatedTemplate)?.environment.orEmpty() contentLoader.getEnvironment(scriptDef)
) )
val lastTimeStamp = requests[path]?.request?.timeStamp val lastTimeStamp = requests[path]?.request?.timeStamp
val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp