From 1597a2e91051d2818c80aca6843fd0b012e85c4d Mon Sep 17 00:00:00 2001
From: Piotr Tomiak <piotr.tomiak@jetbrains.com>
Date: Tue, 13 Jul 2021 11:55:30 +0200
Subject: [PATCH] Fix failing file structure tests

GitOrigin-RevId: a2747116fa2c65a33ad155a8f34f8b3026ea67fb
---
 .../com/intellij/testFramework/FileStructureTestFixture.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/testFramework/src/com/intellij/testFramework/FileStructureTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/FileStructureTestFixture.java
index 21fbf9a89296..f1e57128be3a 100644
--- a/platform/testFramework/src/com/intellij/testFramework/FileStructureTestFixture.java
+++ b/platform/testFramework/src/com/intellij/testFramework/FileStructureTestFixture.java
@@ -11,6 +11,7 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure;
+import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,6 +34,7 @@ public class FileStructureTestFixture implements Disposable {
   @Nullable
   public FilteringTreeStructure.FilteringNode update() {
     FileStructurePopup popup = getPopup();
+    UIUtil.dispatchAllInvocationEvents(); // Prevent write actions cancelling rebuild and update
     PlatformTestUtil.waitForPromise(popup.rebuildAndUpdate());
     TreePath path = PlatformTestUtil.waitForPromise(popup.select(popup.getCurrentElement(myFile)));
     return TreeUtil.getLastUserObject(FilteringTreeStructure.FilteringNode.class, path);