From 7de0bc9cdc19ed523a168ddfd84a2dce9080ce16 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <sergey.rostov@jetbrains.com>
Date: Thu, 7 May 2020 15:52:27 +0300
Subject: [PATCH] ScriptClassRootsUpdater, updateSynchronously: cancel before
 waiting for lock

---
 .../script/configuration/utils/ScriptClassRootsUpdater.kt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsUpdater.kt
index ac118f3cacd..1f4e13bc602 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsUpdater.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/utils/ScriptClassRootsUpdater.kt
@@ -115,13 +115,11 @@ class ScriptClassRootsUpdater(
 
     @Synchronized
     private fun updateSynchronously() {
-        syncLock.withLock {
-            scheduledUpdate?.cancel()
-            doUpdate(false)
-        }
+        scheduledUpdate?.cancel()
+        doUpdate(false)
     }
 
-    fun doUpdate(underProgressManager: Boolean = true) {
+    private fun doUpdate(underProgressManager: Boolean = true) {
         syncLock.withLock {
             try {
                 val updates = manager.collectRootsAndCheckNew()