Revert "fix: Reduce freeze in ProjectUpdater (bazelbuild#7153)"

This reverts commit bdb2b48.
tpasternak · Dec 11, 2024 · d7c7dea · d7c7dea
1 parent bdb2b48
commit d7c7dea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 40 deletions.
diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml
@@ -424,9 +424,6 @@
     <registryKey defaultValue="true"
                  description="Enable basic syntax highliting in Query Sync's 'Analysis Disabled' mode"
                  key="bazel.qsync.enable.basic.highlighting.in.non.analysis.mode"/>
-    <registryKey defaultValue="true"
-                 description="Use coroutine-based ProjectUpdater implementation. It it is supposed to reduce the freeze that happens during sync"
-                 key="bazel.qsync.enable.coroutine.project.updater"/>
     <editorNotificationProvider implementation="com.google.idea.blaze.base.wizard2.BazelNotificationProvider"/>
   </extensions>
 

diff --git a/base/src/com/google/idea/blaze/base/qsync/ProjectUpdater.java b/base/src/com/google/idea/blaze/base/qsync/ProjectUpdater.java
@@ -37,6 +37,7 @@
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.google.idea.blaze.qsync.project.ProjectProto;
 import com.google.idea.blaze.qsync.project.ProjectProto.LibrarySource;
+import com.google.idea.common.util.Transactions;
 import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider;
 import com.intellij.openapi.externalSystem.service.project.ProjectDataManager;
 import com.intellij.openapi.module.Module;
@@ -115,7 +116,7 @@ public void onNewProjectSnapshot(Context<?> context, QuerySyncProjectSnapshot gr
 
   private void updateProjectModel(ProjectProto.Project spec, Context<?> context) {
     File imlDirectory = new File(BlazeDataStorage.getProjectDataDir(importSettings), "modules");
-    ProjectUpdaterThreadingUtils.Companion.readWriteAction(
+    Transactions.submitWriteActionTransactionAndWait(
         () -> {
           IdeModifiableModelsProvider models =
               ProjectDataManager.getInstance().createModifiableModelsProvider(project);
@@ -216,10 +217,9 @@ private void updateProjectModel(ProjectProto.Project spec, Context<?> context) {
                       .build(),
                   workspaceLanguageSettings);
             }
-
+            models.commit();
           }
-          return models;
-        }, models -> models.commit());
+        });
   }
 
   private Library getOrCreateLibrary(

diff --git a/base/src/com/google/idea/blaze/base/qsync/ProjectUpdaterThreadingUtils.kt b/base/src/com/google/idea/blaze/base/qsync/ProjectUpdaterThreadingUtils.kt