Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ bazel_binaries.download(version = "6.5.0")
bazel_binaries.download(version = "7.5.0")
bazel_binaries.download(
current = True,
version = "8.3.1",
version = "8.4.0",
)
bazel_binaries.download(version = "last_green")
use_repo(
Expand All @@ -89,7 +89,7 @@ use_repo(
"bazel_binaries_bazelisk",
"build_bazel_bazel_6_5_0",
"build_bazel_bazel_7_5_0",
"build_bazel_bazel_8_3_1",
"build_bazel_bazel_8_4_0",
"build_bazel_bazel_last_green",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.idea.blaze.clwb.base.Assertions.assertContainsHeader;

import com.google.idea.blaze.base.bazel.BazelVersion;
import com.google.idea.blaze.clwb.base.AllowedVfsRoot;
import com.google.idea.blaze.clwb.base.ClwbHeadlessTestCase;
import com.google.idea.testing.headless.ProjectViewBuilder;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.system.OS;
import com.jetbrains.cidr.lang.workspace.OCCompilerSettings;
import java.util.ArrayList;
import org.jetbrains.annotations.Nullable;
Expand All @@ -25,6 +28,19 @@ public void testClwb() {
checkImplDeps();
}

@Override
protected ProjectViewBuilder projectViewText(BazelVersion version) {
final var builder = super.projectViewText(version);

// required for com.google.idea.blaze.base.sync.workspace.VirtualIncludesHandler to guess the target key
// this will eventually be replaced by the some kind of includes cache on our side
if (OS.CURRENT == OS.Windows) {
builder.addBuildFlag("--features=-shorten_virtual_includes");
}

return builder;
}

@Override
protected void addAllowedVfsRoots(ArrayList<AllowedVfsRoot> roots) {
super.addAllowedVfsRoots(roots);
Expand Down