Revert "fix: Support bazel 8 and --noenable_workspace mode (bazelbu…

…ild#6990)" (bazelbuild#6997) This reverts commit fc3990b. We have to wait until bazel8 rc3
tpasternak · Nov 14, 2024 · b3cb634 · b3cb634
1 parent 7292aab
commit b3cb634
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 55 deletions.
diff --git a/...ests/src/com/google/idea/blaze/aspect/integration/BazelInvokingIntegrationTestRunner.java b/...ests/src/com/google/idea/blaze/aspect/integration/BazelInvokingIntegrationTestRunner.java
@@ -22,7 +22,7 @@
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectStrategy;
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectStrategy.OutputGroup;
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectStrategyBazel;
-import com.google.idea.blaze.base.sync.aspects.strategy.OverrideFlags;
+import com.google.idea.blaze.base.sync.aspects.strategy.AspectRepositoryProvider;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Collection;
@@ -55,12 +55,12 @@ public static void main(String[] a) throws Exception {
             aspectStrategyBazel.getAspectFlag().get(),
             String.format(
                 "%s=%s/%s/aspect",
-                OverrideFlags.overrideRepositoryFlag(false),
+                AspectRepositoryProvider.OVERRIDE_REPOSITORY_FLAG,
                 System.getenv("TEST_SRCDIR"),
                 System.getenv("TEST_WORKSPACE")),
             String.format(
               "%s=%s/%s/aspect_template",
-              OverrideFlags.overrideRepositoryTemplateFlag(false),
+              AspectRepositoryProvider.OVERRIDE_REPOSITORY_TEMPLATE_FLAG,
               System.getenv("TEST_SRCDIR"),
               System.getenv("TEST_WORKSPACE"))
         );

diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectRepositoryProvider.java
@@ -1,7 +1,5 @@
 package com.google.idea.blaze.base.sync.aspects.strategy;
 
-import com.google.idea.blaze.base.model.BlazeProjectData;
-import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.project.Project;
 
@@ -13,6 +11,8 @@ public interface AspectRepositoryProvider {
   ExtensionPointName<AspectRepositoryProvider> EP_NAME =
       ExtensionPointName.create("com.google.idea.blaze.AspectRepositoryProvider");
 
+  String OVERRIDE_REPOSITORY_FLAG = "--override_repository=intellij_aspect";
+  String OVERRIDE_REPOSITORY_TEMPLATE_FLAG = "--override_repository=intellij_aspect_template";
 
   Optional<File> aspectDirectory();
 
@@ -41,24 +41,17 @@ static Optional<File> findAspectTemplateDirectory() {
   }
 
   static Optional<String>[] getOverrideFlags(Project project) {
-
-    Optional<BlazeProjectData> projectData =
-            Optional.ofNullable(BlazeProjectDataManager.getInstance(project))
-                    .flatMap(it -> Optional.ofNullable(it.getBlazeProjectData()));
-    boolean useInjectedRepository = projectData
-            .map(it -> it.getBlazeVersionData().bazelIsAtLeastVersion(8, 0, 0))
-            .orElse(false); //fall back to false, as override_repository is available for all bazel versions
-    return new Optional[]{
-      getOverrideFlagForAspectDirectory(useInjectedRepository),
-      getOverrideFlagForProjectAspectDirectory(project, useInjectedRepository),
+    return new Optional[] {
+      getOverrideFlagForAspectDirectory(),
+      getOverrideFlagForProjectAspectDirectory(project),
     };
   }
 
-  private static Optional<String> getOverrideFlagForAspectDirectory(boolean useInjectedRepository) {
-    return findAspectDirectory().map(it -> OverrideFlags.overrideRepositoryFlag(useInjectedRepository) + "=" + it.getPath());
+  private static Optional<String> getOverrideFlagForAspectDirectory() {
+    return findAspectDirectory().map(it -> OVERRIDE_REPOSITORY_FLAG + "=" + it.getPath());
   }
 
-  private static Optional<String> getOverrideFlagForProjectAspectDirectory(Project project, boolean useInjectedRepository) {
-    return getProjectAspectDirectory(project).map(it -> OverrideFlags.overrideRepositoryTemplateFlag(useInjectedRepository) + "=" + it.getPath());
+  private static Optional<String> getOverrideFlagForProjectAspectDirectory(Project project) {
+    return getProjectAspectDirectory(project).map(it -> OVERRIDE_REPOSITORY_TEMPLATE_FLAG + "=" + it.getPath());
   }
 }
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java
@@ -58,10 +58,7 @@ public Optional<File> aspectTemplateDirectory() {
   @VisibleForTesting
   public AspectStrategyBazel(BlazeVersionData versionData) {
     super(/* aspectSupportsDirectDepsTrimming= */ true);
-    boolean useInjectedRepository = versionData.bazelIsAtLeastVersion(8, 0, 0);
-    if (useInjectedRepository) {
-      aspectFlag = "--aspects=@intellij_aspect//:intellij_info_bundled.bzl%intellij_info_aspect";
-    } else if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
+    if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
       aspectFlag = "--aspects=@@intellij_aspect//:intellij_info_bundled.bzl%intellij_info_aspect";
     } else {
       aspectFlag = "--aspects=@intellij_aspect//:intellij_info_bundled.bzl%intellij_info_aspect";

diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/OverrideFlags.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/OverrideFlags.java
diff --git a/java/src/com/google/idea/blaze/java/fastbuild/BazelFastBuildAspectStrategy.java b/java/src/com/google/idea/blaze/java/fastbuild/BazelFastBuildAspectStrategy.java
@@ -32,10 +32,7 @@ final class BazelFastBuildAspectStrategy extends FastBuildAspectStrategy {
   @Override
   protected List<String> getAspectFlags(BlazeVersionData versionData, Project project) {
     String intellijAspectFile;
-    boolean useInjectedRepository = versionData.bazelIsAtLeastVersion(8, 0, 0);
-    if(useInjectedRepository) {
-      intellijAspectFile = "--aspects=@intellij_aspect//:fast_build_info_bundled.bzl%fast_build_info_aspect";
-    } else if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
+    if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
       intellijAspectFile = "--aspects=@@intellij_aspect//:fast_build_info_bundled.bzl%fast_build_info_aspect";
     } else {
       intellijAspectFile = "--aspects=@intellij_aspect//:fast_build_info_bundled.bzl%fast_build_info_aspect";

diff --git a/java/src/com/google/idea/blaze/java/run/hotswap/JavaClasspathAspectStrategy.java b/java/src/com/google/idea/blaze/java/run/hotswap/JavaClasspathAspectStrategy.java
@@ -25,6 +25,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 
@@ -60,12 +61,9 @@ public boolean isApplicable(BlazeVersionData versionData) {
     @Override
     public ImmutableList<String> getBuildFlags(BlazeVersionData versionData, Project project) {
       String intellijAspect;
-      boolean useInjectedRepository = versionData.bazelIsAtLeastVersion(8, 0, 0);
-      if (useInjectedRepository) {
-        intellijAspect = "--aspects=@intellij_aspect//:java_classpath.bzl%java_classpath_aspect";
-      } else if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
+      if (versionData.bazelIsAtLeastVersion(6, 0, 0)) {
         intellijAspect = "--aspects=@@intellij_aspect//:java_classpath.bzl%java_classpath_aspect";
-      } else { // #bazel5 we are going to drop bazel 5 support in Feb 2025
+      } else {
         intellijAspect = "--aspects=@intellij_aspect//:java_classpath.bzl%java_classpath_aspect";
       }