Massive update to IJ Aspects

The IJ Aspects progressed quite a bit. A new templating system was
introduced to create aspects with different behavior depending on the
Bazel version.

Additional the design was modified so that aspects are no longer added
as a repository but become part of the workspace, i.e. they are copied
into the workspace during sync. This seems to work better with Bazel
caching (according to the IJ Aspects commit history).

When importing aspects we no longer consume them as a repository.
Instead we build them directly in the IJ repository and then copy &
extract into our zip archive. The zip archive is later extracted into a
temp location for better working with multiple Bazel workspaces.

Author: guw

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/BazelModelManager.java

@@ -220,7 +220,6 @@ public void initialize(IWorkspace workspace) throws Exception {
 
         // ensure aspects are usable
         aspects = new IntellijAspects(stateLocation.append("intellij-aspects").toPath());
-        aspects.makeAvailable();
 
         // initialize the classpath manager
         classpathManager = new BazelClasspathManager(stateLocation.toFile(), this);

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/JavaAspectsInfo.java

@@ -74,6 +74,7 @@ static boolean isJavaProtoTarget(TargetIdeInfo target) {
     }
 
     final ParsedBepOutput aspectsBuildResult;
+    final IntellijAspects intellijAspects;
 
     /** index of all aspects loaded from the build output */
     final Map<TargetKey, TargetIdeInfo> ideInfoByTargetKey;
@@ -84,9 +85,11 @@ static boolean isJavaProtoTarget(TargetIdeInfo target) {
     /** index of jars based on their root relative path, which allows lookup of jdeps entries */
     final Map<String, BlazeJarLibrary> libraryByJdepsRootRelativePath;
 
-    public JavaAspectsInfo(ParsedBepOutput aspectsBuildResult, BazelWorkspace bazelWorkspace) throws CoreException {
+    public JavaAspectsInfo(ParsedBepOutput aspectsBuildResult, BazelWorkspace bazelWorkspace,
+            IntellijAspects intellijAspects) throws CoreException {
         super(bazelWorkspace);
         this.aspectsBuildResult = aspectsBuildResult;
+        this.intellijAspects = intellijAspects;
 
         // build maps
         ideInfoByTargetKey = new HashMap<>();
@@ -102,7 +105,7 @@ public JavaAspectsInfo(ParsedBepOutput aspectsBuildResult, BazelWorkspace bazelW
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Processing aspect: {}", outputArtifact);
                 }
-                var targetIdeInfo = TargetIdeInfo.fromProto(getAspects().readAspectFile(outputArtifact));
+                var targetIdeInfo = TargetIdeInfo.fromProto(intellijAspects.readAspectFile(outputArtifact));
                 if (targetIdeInfo == null) {
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Skipping empty aspect: {}", outputArtifact);
@@ -210,10 +213,6 @@ public TargetIdeInfo get(TargetKey targetKey) {
         return ideInfoByTargetKey.get(targetKey);
     }
 
-    public IntellijAspects getAspects() {
-        return bazelWorkspace.getParent().getModelManager().getIntellijAspects();
-    }
-
     public List<BlazeJarLibrary> getLibraries(TargetKey targetKey) {
         return librariesByTargetKey.get(targetKey);
     }

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/ProjectPerPackageProvisioningStrategy.java

@@ -183,7 +183,7 @@ public Map<BazelProject, CompileAndRuntimeClasspath> computeClasspaths(Collectio
                         currentShardCount,
                         shardsToBuild.size(),
                         targetsToBuild.size()));
-                var aspectsInfo = new JavaAspectsInfo(result, workspace);
+                var aspectsInfo = new JavaAspectsInfo(result, workspace, aspects);
                 for (BazelProject bazelProject : shard.keySet()) {
                     subMonitor.subTask(bazelProject.getName());
                     subMonitor.checkCanceled();

bundles/com.salesforce.bazel.eclipse.core/src/com/salesforce/bazel/eclipse/core/model/discovery/ProjectPerTargetProvisioningStrategy.java

@@ -108,7 +108,7 @@ public Map<BazelProject, CompileAndRuntimeClasspath> computeClasspaths(Collectio
 
             // populate map from result
             Map<BazelProject, CompileAndRuntimeClasspath> classpathsByProject = new HashMap<>();
-            var aspectsInfo = new JavaAspectsInfo(result, workspace);
+            var aspectsInfo = new JavaAspectsInfo(result, workspace, aspects);
             for (BazelProject bazelProject : bazelProjects) {
                 monitor.subTask(bazelProject.getName());
                 monitor.checkCanceled();

bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF

@@ -30,6 +30,9 @@ Export-Package: com.salesforce.bazel.sdk;uses:="org.osgi.framework,org.eclipse.c
 Import-Package: com.google.common.annotations;version="32.1.2",
  com.google.common.collect;version="32.1.2",
  com.google.protobuf;version="3.22.0",
+ org.apache.velocity;version="[2.4.0,3.0.0)",
+ org.apache.velocity.app;version="[2.4.0,3.0.0)",
+ org.apache.velocity.context;version="[2.4.0,3.0.0)",
  org.eclipse.core.runtime;version="[3.7.0,4.0.0)",
  org.fusesource.jansi;version="2.4.0",
  org.osgi.framework;version="[1.10.0,2.0.0)",

bundles/com.salesforce.bazel.sdk/aspects/README.md

@@ -16,6 +16,4 @@ The update is a bit automated.
 
 ### Notes
 
-If you get a build error about `no such package '@intellij_....//'` copy the relevant `http_archive` entry from the [IJ WORKSPACE file](https://github.com/bazelbuild/intellij/blob/master/WORKSPACE) and add it to `import/WORKSPACE`.
-
-
+Depending on the changes upstream you have to do quite some work to get it back going.

bundles/com.salesforce.bazel.sdk/aspects/import/.bazelversion

@@ -1 +1 @@
-7.4.1
+8.1.1

bundles/com.salesforce.bazel.sdk/aspects/import/.gitignore

@@ -1,6 +1,6 @@
-# external repo
-intellij/
-intellij_platform_sdk/
+# external repo and outputs
+intellij*
+aspect_*.jar
 
 # bazel symlinks
 bazel-*

bundles/com.salesforce.bazel.sdk/aspects/import/BUILD

@@ -1,13 +1,56 @@
+load("@aspect_bazel_lib//lib:run_binary.bzl", "run_binary")
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", "pkg_mkdirs", "strip_prefix")
 load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
 
+write_file(
+    name = "generate_extract_aspect_lib_jar_sh",
+    out = "extract_aspect_lib_jar.sh",
+    content = [
+        "#!/usr/bin/env bash",
+        "set -o errexit -o nounset -o pipefail",
+        "$JAVABASE/bin/jar xf $2 || fail \"Failed to extract $2\"",
+        "$JAVABASE/bin/jar xf $3 || fail \"Failed to extract $3\"",
+        "mkdir -p $1",
+        "mv aspect/* $1",
+    ],
+    is_executable = True,
+)
+
+sh_binary(
+    name = "extract_aspect_lib_jar_binary",
+    srcs = [":extract_aspect_lib_jar.sh"],
+)
+
+run_binary(
+    name = "aspect_lib",
+    srcs = [
+        "aspect_lib.jar",
+        "aspect_template_lib.jar",
+        "@bazel_tools//tools/jdk:current_java_runtime",
+    ],
+    args = [
+        "$(@D)",
+        "$(location aspect_lib.jar)",
+        "$(location aspect_template_lib.jar)",
+    ],
+    env = {
+        "JAVABASE": "$(JAVABASE)",
+    },
+    out_dirs = ["aspect_lib"],
+    progress_message = "Extracting aspect_lib.jar and aspect_template_lib.jar",
+    tool = ":extract_aspect_lib_jar_binary",
+    toolchains = [
+        "@bazel_tools//tools/jdk:current_java_runtime",
+    ],
+)
+
 pkg_files(
     name = "intelli_aspects",
     srcs = [
-        "@intellij//aspect:aspect_files",
+        ":aspect_lib",
     ],
-    # this magic is needed to get the jars inside the 'tools' directory
-    strip_prefix = strip_prefix.from_pkg("//aspect"),
+    strip_prefix = "aspect_lib/",
 )
 
 pkg_zip(

bundles/com.salesforce.bazel.sdk/aspects/import/MODULE.bazel

@@ -1,6 +1,8 @@
-###############################################################################
-# Bazel now uses Bzlmod by default to manage external dependencies.
-# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
-#
-# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
-###############################################################################
+module(
+    name = "intellij_aspects_import",
+    bazel_compatibility = [">=8.1.0"],
+)
+
+bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_pkg", version = "1.1.0")