From cf82c56c8bc0899ca85a8ed5d7ebeed06663fd78 Mon Sep 17 00:00:00 2001 From: Sergey Pak Date: Wed, 17 Jul 2024 13:17:16 +0200 Subject: [PATCH] attempting to fix com.intellij.settingsSync.SettingsSyncFlowTest.concurrent sync does not disable sync during initialization GitOrigin-RevId: cfdba2e54eb6b14759fc101dc2d534b554f2015e --- .../src/com/intellij/settingsSync/SettingsSyncBridge.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt index 7caa81535d69..a8d4b3c1be0d 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt +++ b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBridge.kt @@ -3,6 +3,7 @@ package com.intellij.settingsSync import com.intellij.codeInsight.template.impl.TemplateSettings import com.intellij.configurationStore.saveSettings import com.intellij.openapi.application.ApplicationManager +import com.intellij.openapi.application.invokeAndWaitIfNeeded import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.platform.util.progress.withProgressText @@ -515,6 +516,13 @@ class SettingsSyncBridge( fun waitForAllExecuted() { runBlocking { processPendingEvents(force = true) + val startTime = System.currentTimeMillis() + while (System.currentTimeMillis() - startTime < 10000 && queueSize > 0) { + delay(10) + } + if (queueSize > 0) { + LOG.warn("Queue size > 0 !!!!!!") + } } }