Properly update names cache from the pooled thread

Not sure how this did work previously. But we requested read action in smart mode from edt, and if we were in the dumb mode, this should have locked, because we are blocking edt and it is necessary to leave the dumb mode.
Camelcade · Nov 13, 2024 · b6a5212 · b6a5212
1 parent eeb1e75
commit b6a5212
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/mojo/src/test/java/completion/MojoCompletionTest.java b/mojo/src/test/java/completion/MojoCompletionTest.java
@@ -26,7 +26,7 @@ public class MojoCompletionTest extends MojoLightTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    updateNamesCacheSynchronously();
   }
 
   @Override

diff --git a/mojo/src/test/java/completion/MojoPerlCompletionTest.java b/mojo/src/test/java/completion/MojoPerlCompletionTest.java
@@ -29,7 +29,7 @@ public class MojoPerlCompletionTest extends MojoLightTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    updateNamesCacheSynchronously();
   }
 
   @Override

diff --git a/plugin/core/src/main/java/com/perl5/lang/perl/idea/project/PerlNamesCache.java b/plugin/core/src/main/java/com/perl5/lang/perl/idea/project/PerlNamesCache.java
@@ -177,7 +177,7 @@ private void doUpdateCache() {
 
   public void forceCacheUpdate() {
     var application = ApplicationManager.getApplication();
-    LOG.assertTrue(!application.isDispatchThread() || application.isUnitTestMode());
+    application.assertIsNonDispatchThread();
     doUpdateCache();
   }
 

diff --git a/plugin/src/test/java/completion/PerlCompletionTestCase.java b/plugin/src/test/java/completion/PerlCompletionTestCase.java
@@ -27,7 +27,7 @@ public abstract class PerlCompletionTestCase extends PerlLightTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    updateNamesCacheSynchronously();
     myState = CodeInsightSettings.getInstance().getState();
     disableAutoInsertion();
   }

diff --git a/plugin/src/test/java/completion/PerlPMCompletionTest.java b/plugin/src/test/java/completion/PerlPMCompletionTest.java
@@ -26,7 +26,7 @@ public class PerlPMCompletionTest extends PerlLightTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    updateNamesCacheSynchronously();
   }
 
   @Override

diff --git a/plugin/src/test/java/completion/PodCompletionEmbeddedTest.java b/plugin/src/test/java/completion/PodCompletionEmbeddedTest.java
@@ -25,7 +25,7 @@ public class PodCompletionEmbeddedTest extends PerlLightTestCase {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    updateNamesCacheSynchronously();
   }
 
   @Override

diff --git a/plugin/src/testFixtures/java/base/PerlLightTestCaseBase.java b/plugin/src/testFixtures/java/base/PerlLightTestCaseBase.java
@@ -230,6 +230,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
@@ -418,8 +419,8 @@ protected void addTestLibrary(@NotNull String testLibraryName) {
         perlProjectManager.addExternalLibrary(libdir);
 
         CodeInsightTestFixtureImpl.ensureIndexesUpToDate(getProject());
-        PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
       }));
+    updateNamesCacheSynchronously();
   }
 
   /**
@@ -464,9 +465,21 @@ protected void setUpLibrary() {
         PerlSdkTable.getInstance().addJdk(testSdk, myPerlLightTestCaseDisposable);
         perlProjectManager.setProjectSdk(testSdk);
         perlProjectManager.addExternalLibrary(libdir);
-        CodeInsightTestFixtureImpl.ensureIndexesUpToDate(getProject());
-        PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
       }));
+    updateNamesCacheSynchronously();
+  }
+
+  protected final void updateNamesCacheSynchronously() {
+    var app = ApplicationManager.getApplication();
+    app.invokeAndWait(() -> CodeInsightTestFixtureImpl.ensureIndexesUpToDate(getProject()));
+    if (app.isDispatchThread()) {
+      Future<?> namesUpdate =
+        app.executeOnPooledThread(() -> PerlNamesCache.getInstance(getProject()).forceCacheUpdate());
+      PlatformTestUtil.waitWithEventsDispatching("Unable to update names in 5 seconds", namesUpdate::isDone, 5);
+    }
+    else {
+      PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+    }
   }
 
   protected @NotNull String getTestLibPath() {
@@ -847,7 +860,7 @@ public void doTestResolve(boolean reparse) {
 
   public void doTestResolveWithoutInit(boolean reparse) {
     if (reparse) {
-      PerlNamesCache.getInstance(getProject()).forceCacheUpdate();
+      updateNamesCacheSynchronously();
       FileContentUtil.reparseFiles(getProject(), Collections.emptyList(), true);
     }
     checkSerializedReferencesWithFile();