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

Refactor ScriptDependenciesUpdater: improve readability a bit

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-07-14 19:56:45 +03:00
parent c0e08c61ee
commit 7aee51fd77
1 changed files with 13 additions and 14 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
+13 -14
View File
@@ -51,12 +51,16 @@ internal class ScriptDependenciesUpdater(
listenToVfsChanges() listenToVfsChanges()
} }
private class TimeStampedRequest(val job: Job, val timeStamp: TimeStamp) private class TimeStampedJob(val actualJob: Job, val timeStamp: TimeStamp) {
fun stampBy(virtualFile: VirtualFile) = ModStampedRequest(virtualFile.modificationStamp, this)
}
private class ModStampedRequest( private class ModStampedRequest(
val modificationStamp: Long, val modificationStamp: Long,
val request: TimeStampedRequest? = null val job: TimeStampedJob? = null
) ) {
fun cancel() = job?.actualJob?.cancel()
}
fun getCurrentDependencies(file: VirtualFile): ScriptDependencies { fun getCurrentDependencies(file: VirtualFile): ScriptDependencies {
cache[file]?.let { return it } cache[file]?.let { return it }
@@ -108,14 +112,9 @@ internal class ScriptDependenciesUpdater(
return return
} }
lastRequest?.request?.job?.cancel() lastRequest?.cancel()
val (currentTimeStamp, newJob) = sendRequest(file, scriptDefinition) requests[path] = sendRequest(file, scriptDefinition).stampBy(file)
requests[path] = ModStampedRequest(
file.modificationStamp,
TimeStampedRequest(newJob, currentTimeStamp)
)
return return
} }
@@ -127,13 +126,13 @@ internal class ScriptDependenciesUpdater(
return true return true
} }
return previousRequest.request == null return previousRequest.job == null
} }
private fun sendRequest( private fun sendRequest(
file: VirtualFile, file: VirtualFile,
scriptDef: KotlinScriptDefinition scriptDef: KotlinScriptDefinition
): Pair<TimeStamp, Job> { ): TimeStampedJob {
val currentTimeStamp = TimeStamps.next() val currentTimeStamp = TimeStamps.next()
val dependenciesResolver = scriptDef.dependencyResolver as AsyncDependenciesResolver val dependenciesResolver = scriptDef.dependencyResolver as AsyncDependenciesResolver
val path = file.path val path = file.path
@@ -143,7 +142,7 @@ internal class ScriptDependenciesUpdater(
contentLoader.getScriptContents(scriptDef, file), contentLoader.getScriptContents(scriptDef, file),
contentLoader.getEnvironment(scriptDef) contentLoader.getEnvironment(scriptDef)
) )
val lastTimeStamp = requests[path]?.request?.timeStamp val lastTimeStamp = requests[path]?.job?.timeStamp
val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp val isLastSentRequest = lastTimeStamp == null || lastTimeStamp == currentTimeStamp
if (isLastSentRequest) { if (isLastSentRequest) {
ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports) ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
@@ -152,7 +151,7 @@ internal class ScriptDependenciesUpdater(
} }
} }
} }
return Pair(currentTimeStamp, newJob) return TimeStampedJob(newJob, currentTimeStamp)
} }
fun updateSync(file: VirtualFile, scriptDef: KotlinScriptDefinition): Boolean { fun updateSync(file: VirtualFile, scriptDef: KotlinScriptDefinition): Boolean {