Add IntelliJAspectStrategy for the new IntelliJ aspect (#8356)

Adds a new aspect strategy (IntelliJAspectStarategy) for the new Intllij aspect (https://github.com/JetBrains/intellij-aspect).

The new aspect is disabled by default but can be enabled with the bazel.sync.use.intellij.aspect registry key or form the command line for testing with --//clwb:use_intellij_aspect=true flag.

Author: LeFrosch

.bazelci/clion.yml

@@ -129,6 +129,23 @@ tasks:
     test_targets:
       - //:clwb_tests
     soft_fail: false
+  CLion-Linux-OSS-latest-stable-intellij-aspect:
+    name: CLion Linux OSS Latest Stable (IntelliJ Aspect)
+    platform: ubuntu2204
+    build_flags:
+      - --lockfile_mode=error
+      - --define=ij_product=clion-oss-latest-stable
+      - --//clwb:use_intellij_aspect=true
+    build_targets:
+      - //clwb:clwb_bazel_zip
+      - //clwb:headless_tests
+    test_flags:
+      - --define=ij_product=clion-oss-latest-stable
+      - --//clwb:use_intellij_aspect=true
+      - --test_output=errors
+    test_targets:
+      - //clwb:headless_tests
+    soft_fail: true
   CLion-last-green:
     name: CLion Headless Tests Last Green
     platform: ubuntu2204

MODULE.bazel

@@ -6,12 +6,23 @@ bazel_dep(name = "protobuf", version = "35.0")
 bazel_dep(name = "bazel_skylib", version = "1.9.0")
 bazel_dep(name = "rules_pkg", version = "1.2.0")
 bazel_dep(name = "rules_jvm_external", version = "7.0")
+bazel_dep(name = "rules_kotlin", version = "2.3.20")
+
+register_toolchains("//third_party/kotlin:toolchain")
 
 # required for aspect tests
 bazel_dep(name = "rules_shell", version = "0.8.0")
 bazel_dep(name = "rules_cc", version = "0.2.18")
 bazel_dep(name = "abseil-cpp", version = "20250814.2")
 
+# dependency on the new aspect's sdk
+bazel_dep(name = "intellij_aspect_sdk")
+git_override(
+    module_name = "intellij_aspect_sdk",
+    commit = "6149b049b48845ba8aec82ea11861c31414f7576",
+    remote = "https://github.com/JetBrains/intellij-aspect.git",
+)
+
 # import clwb test projects for aspect tests
 local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
 
@@ -33,16 +44,6 @@ single_version_override(
     patches = ["//third_party/bazel/patches:rules_bazel_integration_test.patch"],
 )
 
-# custom rules kotlin version, patches are required
-bazel_dep(name = "rules_kotlin", version = "2.3.20")
-single_version_override(
-    module_name = "rules_kotlin",
-    patch_strip = 1,
-    patches = ["//third_party/kotlin/patches:strip_stdlib.patch"],
-)
-
-register_toolchains("//third_party/kotlin:toolchain")
-
 # configure python cor rules_python
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(

MODULE.bazel.lock

@@ -9,7 +9,7 @@ licenses(["notice"])
 proto_library(
     name = "intellij_aspect_test_fixture_proto",
     srcs = ["intellij_aspect_test_fixture.proto"],
-    deps = ["//proto:intellij_ide_info_proto"],
+    deps = ["@intellij_aspect_sdk//sdk/proto:ide_info_proto"],
 )
 
 java_proto_library(
@@ -26,7 +26,7 @@ java_binary(
     deps = [
         ":intellij_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
-        "//proto:intellij_ide_info_java_proto",
+        "//proto:proto_deps",
         "@protobuf//:protobuf_java",
     ],
 )
@@ -40,8 +40,7 @@ java_library(
         ":intellij_aspect_test_fixture_java_proto",
         "//aspect/testing:guava",
         "//intellij_platform_sdk:jsr305",
-        "//proto:common_java_proto",
-        "//proto:intellij_ide_info_java_proto",
+        "//proto:proto_deps",
         "//third_party/java/junit",
     ],
 )

aspect/testing/rules/BUILD

@@ -14,7 +14,7 @@
 
 syntax = "proto3";
 
-import "proto/intellij_ide_info.proto";
+import "sdk/proto/ide_info.proto";
 
 package blaze;
 

aspect/testing/rules/intellij_aspect_test_fixture.proto

@@ -25,7 +25,6 @@
 import com.google.devtools.intellij.aspect.Common.ArtifactLocation;
 import com.google.devtools.intellij.ideinfo.IntellijIdeInfo.Dependency;
 import com.google.devtools.intellij.ideinfo.IntellijIdeInfo.Dependency.DependencyType;
-import com.google.devtools.intellij.ideinfo.IntellijIdeInfo.LibraryArtifact;
 import com.google.devtools.intellij.ideinfo.IntellijIdeInfo.TargetIdeInfo;
 import com.google.devtools.intellij.ideinfo.IntellijIdeInfo.TargetKey;
 import java.io.File;
@@ -221,42 +220,6 @@ protected Dependency dep(TargetIdeInfo targetIdeInfo) {
         .build();
   }
 
-  protected static String libraryArtifactToString(LibraryArtifact libraryArtifact) {
-    StringBuilder stringBuilder = new StringBuilder();
-    if (libraryArtifact.hasJar()) {
-      stringBuilder.append("<jar:");
-      stringBuilder.append(libraryArtifact.getJar().getRelativePath());
-      stringBuilder.append(">");
-    }
-    if (libraryArtifact.hasInterfaceJar()) {
-      stringBuilder.append("<ijar:");
-      stringBuilder.append(libraryArtifact.getInterfaceJar().getRelativePath());
-      stringBuilder.append(">");
-    }
-    if (libraryArtifact.hasSourceJar()) {
-      stringBuilder.append("<source:");
-      stringBuilder.append(libraryArtifact.getSourceJar().getRelativePath());
-      stringBuilder.append(">");
-    }
-
-    return stringBuilder.toString();
-  }
-
-  /** Constructs a string that matches OutputJar#toString for comparison testing. */
-  protected static String jarString(String jar, String iJar, String sourceJar) {
-    StringBuilder sb = new StringBuilder();
-    if (jar != null) {
-      sb.append("<jar:" + jar + ">");
-    }
-    if (iJar != null) {
-      sb.append("<ijar:" + iJar + ">");
-    }
-    if (sourceJar != null) {
-      sb.append("<source:" + sourceJar + ">");
-    }
-    return sb.toString();
-  }
-
   protected static Iterable<String> relativePathsForArtifacts(List<ArtifactLocation> sourcesList) {
     return sourcesList.stream().map(ArtifactLocation::getRelativePath).collect(toList());
   }

aspect/testing/rules/src/com/google/idea/blaze/aspect/IntellijAspectTest.java

@@ -44,7 +44,7 @@ java_test(
         "//aspect/testing/rules:IntellijAspectTest",
         "//aspect/testing/rules:intellij_aspect_test_fixture_java_proto",
         "//intellij_platform_sdk:test_libs",
-        "//proto:intellij_ide_info_java_proto",
+        "//proto:proto_deps",
         "//third_party/java/junit",
     ],
 )

aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/ccbinary/BUILD

@@ -18,8 +18,8 @@ cc_library(
         "other/headers",
     ],
     defines = ["VERSION2"],
-    local_defines = ["LOCAL_DEFINE"],
     includes = ["foo/bar"],
+    local_defines = ["LOCAL_DEFINE"],
     textual_hdrs = ["simple/simple_textual.h"],
 )
 
@@ -67,7 +67,7 @@ java_test(
         "//aspect/testing/rules:IntellijAspectTest",
         "//aspect/testing/rules:intellij_aspect_test_fixture_java_proto",
         "//intellij_platform_sdk:test_libs",
-        "//proto:intellij_ide_info_java_proto",
+        "//proto:proto_deps",
         "//third_party/java/junit",
     ],
 )

aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cclibrary/BUILD

@@ -28,7 +28,7 @@ java_test(
         "//aspect/testing/rules:IntellijAspectTest",
         "//aspect/testing/rules:intellij_aspect_test_fixture_java_proto",
         "//intellij_platform_sdk:test_libs",
-        "//proto:intellij_ide_info_java_proto",
+        "//proto:proto_deps",
         "//third_party/java/junit",
     ],
 )

aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cctest/BUILD

@@ -35,7 +35,6 @@ public void testCcTest() throws Exception {
     assertThat(target.getKind()).isEqualTo("cc_test");
 
     assertThat(target.hasCIdeInfo()).isTrue();
-    assertThat(target.hasJavaIdeInfo()).isFalse();
     CIdeInfo cTargetIdeInfo = target.getCIdeInfo();
 
     assertThat(cTargetIdeInfo.getRuleContext().getCoptsList()).isEmpty();