From 74ee5f6f8337c608038964409c931b48cd294ee9 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 2 Dec 2024 12:36:13 +0100 Subject: [PATCH 1/3] fix: remove strongInfoHolder flag, so users can choose which plugin to use on import --- .../blaze/base/project/AutoImportProjectOpenProcessor.java | 4 ++-- .../idea/blaze/base/project/BlazeProjectOpenProcessor.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java index 6fb6cabd089..4dbe22e82ea 100644 --- a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java @@ -67,7 +67,7 @@ public class AutoImportProjectOpenProcessor extends ProjectOpenProcessor { public @NotNull @Nls String getName() { - return Blaze.defaultBuildSystemName() + " Project"; + return "Bazel (OG)"; } @javax.annotation.Nullable @@ -78,7 +78,7 @@ public Icon getIcon() { @Override public boolean isStrongProjectInfoHolder() { - return true; + return false; } @Override diff --git a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java index 2f53db4bd26..c19e113713f 100644 --- a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.projectImport.ProjectOpenProcessor; import icons.BlazeIcons; +import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; import javax.swing.Icon; @@ -33,8 +34,8 @@ /** Allows directly opening a project with project data directory embedded within the project. */ public class BlazeProjectOpenProcessor extends ProjectOpenProcessor { @Override - public String getName() { - return Blaze.defaultBuildSystemName() + " Project"; + public @NotNull String getName() { + return "Bazel (OG)"; } @Nullable @@ -72,7 +73,7 @@ public boolean canOpenProject(VirtualFile file) { @Override public boolean isStrongProjectInfoHolder() { - return Registry.is("bazel.project.auto.open.if.present", true); + return Registry.is("bazel.project.auto.open.if.present", false); } @Override From baab4271d657040e4ec64c7539f36ebe75bc9558 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 2 Dec 2024 13:14:09 +0100 Subject: [PATCH 2/3] Update AutoImportProjectOpenProcessor.java --- .../idea/blaze/base/project/AutoImportProjectOpenProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java index 4dbe22e82ea..9a85eb31f15 100644 --- a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java @@ -67,7 +67,7 @@ public class AutoImportProjectOpenProcessor extends ProjectOpenProcessor { public @NotNull @Nls String getName() { - return "Bazel (OG)"; + return "Bazel"; } @javax.annotation.Nullable From ac1e7c0f92352747aee2a1c68a1f73e2b64a30f3 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 2 Dec 2024 13:14:40 +0100 Subject: [PATCH 3/3] Update BlazeProjectOpenProcessor.java --- .../idea/blaze/base/project/BlazeProjectOpenProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java index c19e113713f..16760f6d7cf 100644 --- a/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/BlazeProjectOpenProcessor.java @@ -35,7 +35,7 @@ public class BlazeProjectOpenProcessor extends ProjectOpenProcessor { @Override public @NotNull String getName() { - return "Bazel (OG)"; + return "Bazel"; } @Nullable