Project Status API integration with bazel for CLion

base/src/com/google/idea/blaze/base/wizard2/BazelImportCurrentProjectAction.java

@@ -23,14 +23,13 @@
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.google.idea.blaze.base.sync.workspace.WorkspacePathResolver;
 import com.google.idea.blaze.base.sync.workspace.WorkspacePathResolverImpl;
-import com.intellij.ide.DataManager;
 import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.ui.EditorNotificationPanel;
 import java.io.File;
 import org.jetbrains.annotations.NotNull;
 
@@ -49,7 +48,7 @@ public static boolean projectCouldBeImported(Project project) {
     return BazelWorkspaceRootProvider.INSTANCE.isWorkspaceRoot(new File(root));
   }
 
-  public static Runnable createAction(EditorNotificationPanel panel, String basePath) {
+  public static Runnable createAction(String basePath) {
     File baseFile = new File(basePath);
     BazelImportCurrentProjectAction action = new BazelImportCurrentProjectAction(baseFile);
 
@@ -58,7 +57,7 @@ public static Runnable createAction(EditorNotificationPanel panel, String basePa
           action,
           null,
           ActionPlaces.UNKNOWN,
-          DataManager.getInstance().getDataContext(panel)
+          DataContext.EMPTY_CONTEXT
       );
 
       if (ActionUtil.lastUpdateAndCheckDumb(action, event, true)) {
@@ -69,7 +68,8 @@ public static Runnable createAction(EditorNotificationPanel panel, String basePa
 
   final File workspaceRootFile;
 
-  private BazelImportCurrentProjectAction(File workspaceRootFile) {
+  public BazelImportCurrentProjectAction(File workspaceRootFile) {
+    super("Import current project");
     this.workspaceRootFile = workspaceRootFile;
   }
 

base/src/com/google/idea/blaze/base/wizard2/BazelNotificationProvider.java

@@ -34,7 +34,7 @@ public class BazelNotificationProvider implements EditorNotificationProvider, Du
   @Override
   public @Nullable Function<? super FileEditor, ? extends JComponent> collectNotificationData(
       @NotNull Project project, @NotNull VirtualFile file) {
-    if (file.getFileType() != BuildFileType.INSTANCE) {
+    if (!isProjectAwareFile(file)) {
       return null;
     }
     if (!BazelImportCurrentProjectAction.projectCouldBeImported(project)) {
@@ -51,7 +51,7 @@ public class BazelNotificationProvider implements EditorNotificationProvider, Du
 
     return fileEditor -> {
       EditorNotificationPanel panel = new EditorNotificationPanel(fileEditor, Status.Warning);
-      Runnable importAction = BazelImportCurrentProjectAction.createAction(panel, root);
+      Runnable importAction = BazelImportCurrentProjectAction.createAction(root);
 
       panel.setText("Project is not configured");
       panel.createActionLabel("Import Bazel project", importAction);
@@ -60,4 +60,8 @@ public class BazelNotificationProvider implements EditorNotificationProvider, Du
       return panel;
     };
   }
+
+  protected boolean isProjectAwareFile(@NotNull VirtualFile file) {
+    return file.getFileType() == BuildFileType.INSTANCE;
+  }
 }

clwb/sdkcompat/BUILD

@@ -28,5 +28,8 @@ java_library(
         "clion-2024.2": ["//clwb/sdkcompat/v242"],
     }),
     visibility = ["//clwb:__pkg__"],
-    deps = ["//intellij_platform_sdk:plugin_api"],
+    deps = [
+        "//base",
+        "//intellij_platform_sdk:plugin_api",
+    ],
 )

clwb/sdkcompat/v223/com/google/idea/blaze/clwb/BazelCNotificationProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.wizard2.BazelNotificationProvider;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import com.jetbrains.cidr.lang.OCLanguageUtilsBase;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Provide notification for C-family files temporarily until moving to new CLion project status
+ * api.
+ */
+// #api241
+public class BazelCNotificationProvider extends BazelNotificationProvider {
+
+  @Override
+  protected boolean isProjectAwareFile(@NotNull VirtualFile file) {
+    return OCLanguageUtilsBase.isSupported(file.getFileType());
+  }
+}

clwb/sdkcompat/v223/com/google/idea/blaze/clwb/CLionNotificationProvider.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.settings.Blaze;
+import com.intellij.openapi.project.Project;
+import com.intellij.ui.EditorNotificationProvider;
+import com.jetbrains.cidr.cpp.cmake.workspace.CMakeNotificationProvider;
+
+// #api241
+public class CLionNotificationProvider {
+
+  public static void register(Project project) {
+    if (Blaze.isBlazeProject(project)) {
+      // Note: We want to remove the CMake notification banner in case that the project is Bazel.
+      var exPoint = EditorNotificationProvider.EP_NAME.getPoint(project);
+      for (var extension : exPoint.getExtensions()) {
+        if (extension instanceof CMakeNotificationProvider) {
+          exPoint.unregisterExtension(extension);
+        }
+      }
+    }
+  }
+}

clwb/sdkcompat/v231/com/google/idea/blaze/clwb/BazelCNotificationProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.wizard2.BazelNotificationProvider;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import com.jetbrains.cidr.lang.OCLanguageUtilsBase;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Provide notification for C-family files temporarily until moving to new CLion project status
+ * api.
+ */
+// #api241
+public class BazelCNotificationProvider extends BazelNotificationProvider {
+
+  @Override
+  protected boolean isProjectAwareFile(@NotNull VirtualFile file) {
+    return OCLanguageUtilsBase.isSupported(file.getFileType());
+  }
+}

clwb/sdkcompat/v231/com/google/idea/blaze/clwb/CLionNotificationProvider.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.settings.Blaze;
+import com.intellij.openapi.project.Project;
+import com.intellij.ui.EditorNotificationProvider;
+import com.jetbrains.cidr.cpp.cmake.workspace.CMakeNotificationProvider;
+
+// #api241
+public class CLionNotificationProvider {
+
+  public static void register(Project project) {
+    if (Blaze.isBlazeProject(project)) {
+      // Note: We want to remove the CMake notification banner in case that the project is Bazel.
+      var exPoint = EditorNotificationProvider.EP_NAME.getPoint(project);
+      for (var extension : exPoint.getExtensions()) {
+        if (extension instanceof CMakeNotificationProvider) {
+          exPoint.unregisterExtension(extension);
+        }
+      }
+    }
+  }
+}

clwb/sdkcompat/v232/com/google/idea/blaze/clwb/BazelCNotificationProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.wizard2.BazelNotificationProvider;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import com.jetbrains.cidr.lang.OCLanguageUtilsBase;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Provide notification for C-family files temporarily until moving to new CLion project status
+ * api.
+ */
+// #api241
+public class BazelCNotificationProvider extends BazelNotificationProvider {
+
+  @Override
+  protected boolean isProjectAwareFile(@NotNull VirtualFile file) {
+    return OCLanguageUtilsBase.isSupported(file.getFileType());
+  }
+}

clwb/sdkcompat/v232/com/google/idea/blaze/clwb/CLionNotificationProvider.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.settings.Blaze;
+import com.intellij.openapi.project.Project;
+import com.intellij.ui.EditorNotificationProvider;
+import com.jetbrains.cidr.cpp.cmake.workspace.CMakeNotificationProvider;
+
+// #api241
+public class CLionNotificationProvider {
+
+  public static void register(Project project) {
+    if (Blaze.isBlazeProject(project)) {
+      // Note: We want to remove the CMake notification banner in case that the project is Bazel.
+      var exPoint = EditorNotificationProvider.EP_NAME.getPoint(project);
+      for (var extension : exPoint.getExtensions()) {
+        if (extension instanceof CMakeNotificationProvider) {
+          exPoint.unregisterExtension(extension);
+        }
+      }
+    }
+  }
+}

clwb/sdkcompat/v233/com/google/idea/blaze/clwb/BazelCNotificationProvider.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.wizard2.BazelNotificationProvider;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import com.jetbrains.cidr.lang.OCLanguageUtilsBase;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Provide notification for C-family files temporarily until moving to new CLion project status
+ * api.
+ */
+// #api241
+public class BazelCNotificationProvider extends BazelNotificationProvider {
+
+  @Override
+  protected boolean isProjectAwareFile(@NotNull VirtualFile file) {
+    return OCLanguageUtilsBase.isSupported(file.getFileType());
+  }
+}

clwb/sdkcompat/v233/com/google/idea/blaze/clwb/CLionNotificationProvider.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 The Bazel Authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.idea.blaze.clwb;
+
+import com.google.idea.blaze.base.settings.Blaze;
+import com.intellij.openapi.project.Project;
+import com.intellij.ui.EditorNotificationProvider;
+import com.jetbrains.cidr.cpp.cmake.workspace.CMakeNotificationProvider;
+
+// #api241
+public class CLionNotificationProvider {
+
+  public static void register(Project project) {
+    if (Blaze.isBlazeProject(project)) {
+      // Note: We want to remove the CMake notification banner in case that the project is Bazel.
+      var exPoint = EditorNotificationProvider.EP_NAME.getPoint(project);
+      for (var extension : exPoint.getExtensions()) {
+        if (extension instanceof CMakeNotificationProvider) {
+          exPoint.unregisterExtension(extension);
+        }
+      }
+    }
+  }
+}