From afd734ef366cf9dd04f761b2b1a2d755f21cc5bf Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 2 Sep 2024 10:52:16 +0200 Subject: [PATCH] chore: Add a registry flag to disable ExternalWorkspaceDataProvider --- base/src/META-INF/blaze-base.xml | 3 +++ .../idea/blaze/base/model/ExternalWorkspaceDataProvider.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml index e45364e215b..ba8931a0b07 100644 --- a/base/src/META-INF/blaze-base.xml +++ b/base/src/META-INF/blaze-base.xml @@ -411,6 +411,9 @@ + diff --git a/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java b/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java index 291a53d2dcc..039953c105d 100644 --- a/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java +++ b/base/src/com/google/idea/blaze/base/model/ExternalWorkspaceDataProvider.java @@ -31,6 +31,7 @@ import com.google.idea.blaze.base.sync.SyncMode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.registry.Registry; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -60,7 +61,7 @@ static Boolean isEnabled(BlazeVersionData blazeVersionData) { // bg: some blaze workspaces with blaze > MINIMUM_BLAZE_VERSION // have explicitly disabled this bzlmod support and this causes // `blaze mod` to fail. - return false /* blazeVersionData.bazelIsAtLeastVersion(MINIMUM_BLAZE_VERSION) */; + return blazeVersionData.bazelIsAtLeastVersion(MINIMUM_BLAZE_VERSION) && Registry.is("bazel.read.external.workspace.data"); } public ListenableFuture getExternalWorkspaceData(