Added MODULE.bazel to valid workspace root files (#6127)

bazelbuild · Feb 22, 2024 · 27b3133 · 27b3133
1 parent 8b64eb5
commit 27b3133
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/base/src/com/google/idea/blaze/base/bazel/BazelWorkspaceRootProvider.java b/base/src/com/google/idea/blaze/base/bazel/BazelWorkspaceRootProvider.java
@@ -27,11 +27,12 @@ public class BazelWorkspaceRootProvider implements WorkspaceRootProvider {
 
   private BazelWorkspaceRootProvider() {}
 
-  /** Checks for the existence of a WORKSPACE file in the given directory. */
+  /** Checks for the existence of a WORKSPACE or MODULE.bazel file in the given directory. */
   @Override
   public boolean isWorkspaceRoot(File file) {
     return FileOperationProvider.getInstance().isFile(new File(file, "WORKSPACE"))
-        || FileOperationProvider.getInstance().isFile(new File(file, "WORKSPACE.bazel"));
+        || FileOperationProvider.getInstance().isFile(new File(file, "WORKSPACE.bazel"))
+        || FileOperationProvider.getInstance().isFile(new File(file, "MODULE.bazel"));
   }
 
   @Nullable

diff --git a/base/src/com/google/idea/blaze/base/wizard2/UseExistingBazelWorkspaceOption.java b/base/src/com/google/idea/blaze/base/wizard2/UseExistingBazelWorkspaceOption.java
@@ -121,7 +121,7 @@ public WorkspaceTypeData getWorkspaceData() throws ConfigurationException {
     if (!isWorkspaceRoot(workspaceRootFile)) {
       throw new ConfigurationException(
           "Invalid workspace root: choose a bazel workspace directory "
-              + "(containing a WORKSPACE file)");
+              + "(containing a WORKSPACE or MODULE.bazel file)");
     }
     WorkspaceRoot root = new WorkspaceRoot(workspaceRootFile);
     return WorkspaceTypeData.builder()