Skip to content

Commit d7c7dea

Browse files
author
Tomasz Pasternak
committed
Revert "fix: Reduce freeze in ProjectUpdater (bazelbuild#7153)"
This reverts commit bdb2b48.
1 parent bdb2b48 commit d7c7dea

File tree

3 files changed

+4
-40
lines changed

3 files changed

+4
-40
lines changed

base/src/META-INF/blaze-base.xml

-3
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,6 @@
424424
<registryKey defaultValue="true"
425425
description="Enable basic syntax highliting in Query Sync's 'Analysis Disabled' mode"
426426
key="bazel.qsync.enable.basic.highlighting.in.non.analysis.mode"/>
427-
<registryKey defaultValue="true"
428-
description="Use coroutine-based ProjectUpdater implementation. It it is supposed to reduce the freeze that happens during sync"
429-
key="bazel.qsync.enable.coroutine.project.updater"/>
430427
<editorNotificationProvider implementation="com.google.idea.blaze.base.wizard2.BazelNotificationProvider"/>
431428
</extensions>
432429

base/src/com/google/idea/blaze/base/qsync/ProjectUpdater.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.google.idea.blaze.qsync.project.ProjectPath;
3838
import com.google.idea.blaze.qsync.project.ProjectProto;
3939
import com.google.idea.blaze.qsync.project.ProjectProto.LibrarySource;
40+
import com.google.idea.common.util.Transactions;
4041
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider;
4142
import com.intellij.openapi.externalSystem.service.project.ProjectDataManager;
4243
import com.intellij.openapi.module.Module;
@@ -115,7 +116,7 @@ public void onNewProjectSnapshot(Context<?> context, QuerySyncProjectSnapshot gr
115116

116117
private void updateProjectModel(ProjectProto.Project spec, Context<?> context) {
117118
File imlDirectory = new File(BlazeDataStorage.getProjectDataDir(importSettings), "modules");
118-
ProjectUpdaterThreadingUtils.Companion.readWriteAction(
119+
Transactions.submitWriteActionTransactionAndWait(
119120
() -> {
120121
IdeModifiableModelsProvider models =
121122
ProjectDataManager.getInstance().createModifiableModelsProvider(project);
@@ -216,10 +217,9 @@ private void updateProjectModel(ProjectProto.Project spec, Context<?> context) {
216217
.build(),
217218
workspaceLanguageSettings);
218219
}
219-
220+
models.commit();
220221
}
221-
return models;
222-
}, models -> models.commit());
222+
});
223223
}
224224

225225
private Library getOrCreateLibrary(

base/src/com/google/idea/blaze/base/qsync/ProjectUpdaterThreadingUtils.kt

-33
This file was deleted.

0 commit comments

Comments
 (0)