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

BackgroundExecutor: cancel all tasks on user cancel, remove useless updateProgress call

Browse Source
This commit is contained in:
Sergey Rostov
2019-10-29 14:24:54 +03:00
committed by Natalia Selezneva
parent 19d35d7f27
commit a89ce4c590
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/BackgroundExecutor.kt
+5 -3
View File
@@ -70,8 +70,6 @@ internal class BackgroundExecutor(
if (queue.add(task)) { if (queue.add(task)) {
debug(task.key) { "added to update queue" } debug(task.key) { "added to update queue" }
updateProgress()
// If the queue is longer than PROGRESS_INDICATOR_MIN_QUEUE, show progress and cancel button // If the queue is longer than PROGRESS_INDICATOR_MIN_QUEUE, show progress and cancel button
if (queue.size > PROGRESS_INDICATOR_MIN_QUEUE) { if (queue.size > PROGRESS_INDICATOR_MIN_QUEUE) {
requireUnderProgressWorker() requireUnderProgressWorker()
@@ -170,7 +168,11 @@ internal class BackgroundExecutor(
val next = synchronized(this@BackgroundExecutor) { val next = synchronized(this@BackgroundExecutor) {
if (shouldStop) return if (shouldStop) return
if (checkCancelled() || queue.isEmpty()) { if (checkCancelled()) {
queue.clear()
endBatch()
return
} else if (queue.isEmpty()) {
endBatch() endBatch()
return return
} }