diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java index 8e18ab6703e8..0c7139d31ac8 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImplTest.java @@ -1,6 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.fileEditor.impl; +import com.intellij.ide.actionsOnSave.impl.ActionsOnSaveManager; import com.intellij.mock.MockVirtualFile; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; @@ -21,6 +22,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.testFramework.HeavyPlatformTestCase; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.common.ThreadUtil; import com.intellij.util.ConcurrencyUtil; import com.intellij.util.IncorrectOperationException; @@ -246,6 +248,11 @@ public class FileDocumentManagerImplTest extends HeavyPlatformTestCase { myDocumentManager.saveAllDocuments(); UIUtil.dispatchAllInvocationEvents(); + // "Actions on save" manager retains documents to be saved to run some actions on them + Future future = ApplicationManager.getApplication().executeOnPooledThread(() -> { + ActionsOnSaveManager.Companion.getInstance(myProject).waitForTasks(); + }); + PlatformTestUtil.waitWithEventsDispatching("Could not finish auto-correction in 10 seconds", () -> future.isDone(), 10); GCWatcher.tracking(myDocumentManager.getDocument(file)).ensureCollected();