Fast test supports Scala junit

Via running bloop and BSP

Fast test supports ITs
Location substitution supports runpath(s) in addition to location(s)
Still includes a hack of the env variable of BUILD_TOOL which we need to see how to remove but at least a smaller hack than before

Full Compile on proto file changes

don't update sources after proto change already exists

Author: ittaiz

aspect/fast_build_info.bzl

@@ -43,6 +43,9 @@ def _fast_build_info_impl(target, ctx):
     elif java_common.JavaToolchainInfo != platform_common.ToolchainInfo and \
          java_common.JavaToolchainInfo in target:
         toolchain = target[java_common.JavaToolchainInfo]
+    elif hasattr(ctx.rule.attr, "java_compile_toolchain") and ctx.rule.attr.java_compile_toolchain and \
+         java_common.JavaToolchainInfo in ctx.rule.attr.java_compile_toolchain:
+        toolchain = ctx.rule.attr.java_compile_toolchain[java_common.JavaToolchainInfo]
     else:
         toolchain = None
     if toolchain:
@@ -53,11 +56,17 @@ def _fast_build_info_impl(target, ctx):
         bootclasspath_jars = []
         if hasattr(toolchain, "bootclasspath"):
             bootclasspath_jars = [artifact_location(f) for f in toolchain.bootclasspath.to_list()]
+        java_runtime = struct()
+        if hasattr(toolchain, "java_runtime"):
+            java_runtime = struct_omit_none(
+                java_executable_exec_path = toolchain.java_runtime.java_executable_exec_path,
+            )
         info["java_toolchain_info"] = struct_omit_none(
             javac_jars = javac_jars,
             bootclasspath_jars = bootclasspath_jars,
             source_version = toolchain.source_version,
             target_version = toolchain.target_version,
+            java_runtime = java_runtime,
         )
     if JavaInfo in target:
         write_output = True
@@ -92,6 +101,13 @@ def _fast_build_info_impl(target, ctx):
         )
         info["android_info"] = android_info
 
+    if ProtoInfo in target:
+        write_output = True
+        proto_info = {
+            "sources": sources_from_target(ctx),
+        }
+        info["proto_info"] = struct_omit_none(**proto_info)
+
     if write_output:
         output_file = ctx.actions.declare_file(target.label.name + ".ide-fast-build-info.txt")
         ctx.actions.write(output_file, struct_omit_none(**info).to_proto())

base/src/com/google/idea/blaze/base/scope/output/StatusOutput.java

@@ -36,4 +36,4 @@ public StatusOutput(@NotNull String status) {
   public String getStatus() {
     return status;
   }
-}
+}

base/src/com/google/idea/blaze/base/toolwindow/ConsoleView.java

@@ -69,10 +69,10 @@ final class ConsoleView implements Disposable {
   private static long consoleIdCounter;
 
   private static final Class<?>[] IGNORED_CONSOLE_ACTION_TYPES = {
-    PreviousOccurenceToolbarAction.class, // common_typos_disable
-    NextOccurenceToolbarAction.class,
-    ClearConsoleAction.class,
-    PrintAction.class
+      PreviousOccurenceToolbarAction.class, // common_typos_disable
+      NextOccurenceToolbarAction.class,
+      ClearConsoleAction.class,
+      PrintAction.class
   };
 
   private final Project project;
@@ -359,4 +359,4 @@ public JComponent getContent() {
     }
     return content;
   }
-}
+}

ijwb/src/META-INF/java-contents.xml

@@ -19,5 +19,6 @@
     <JavaSyncAugmenter implementation="com.google.idea.blaze.ijwb.android.BlazeAndroidLiteJavaSyncAugmenter"/>
     <SyncDataDeserializer implementation="com.google.idea.blaze.java.sync.model.BlazeJavaSyncData$Deserializer"/>
     <SyncDataDeserializer implementation="com.google.idea.blaze.java.sync.jdeps.JdepsState$Deserializer"/>
+    <FastBuildCompilerExtensionPoint implementation="com.google.idea.blaze.java.fastbuild.FastBuildJavaCompilerExtensionPoint"/>
   </extensions>
 </idea-plugin>

java/BUILD

@@ -114,24 +114,6 @@ intellij_plugin(
 intellij_unit_test_suite(
     name = "unit_tests",
     srcs = glob(["tests/unittests/**/*.java"]),
-    # Used for the compiler tests
-    data = [
-        ":auto_value_lib_deploy.jar",
-        ":auto_value_plugin_lib_deploy.jar",
-        ":fast_build_javac",
-        ":guava_lib_deploy.jar",
-        ":truth_lib_deploy.jar",
-    ],
-    jvm_flags = [
-        "-Dauto_value.jar=$(location :auto_value_lib_deploy.jar)",
-        "-Dauto_value_plugin.jar=$(location :auto_value_plugin_lib_deploy.jar)",
-        "-Dfast_build_javac.jar=$(location :fast_build_javac)",
-        "-Dguava.jar=$(location :guava_lib_deploy.jar)",
-        "-Dtruth.jar=$(location :truth_lib_deploy.jar)",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-        "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-    ],
     test_package_root = "com.google.idea.blaze.java",
     deps = [
         ":java",
@@ -180,6 +162,24 @@ java_binary(
 intellij_integration_test_suite(
     name = "integration_tests",
     srcs = glob(["tests/integrationtests/**/*.java"]),
+    # Used for the compiler tests
+    data = [
+        ":auto_value_lib_deploy.jar",
+        ":auto_value_plugin_lib_deploy.jar",
+        ":fast_build_javac",
+        ":guava_lib_deploy.jar",
+        ":truth_lib_deploy.jar",
+    ],
+    jvm_flags = [
+        "-Dauto_value.jar=$(location :auto_value_lib_deploy.jar)",
+        "-Dauto_value_plugin.jar=$(location :auto_value_plugin_lib_deploy.jar)",
+        "-Dfast_build_javac.jar=$(location :fast_build_javac)",
+        "-Dguava.jar=$(location :guava_lib_deploy.jar)",
+        "-Dtruth.jar=$(location :truth_lib_deploy.jar)",
+        "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+        "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+        "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+    ],
     required_plugins = "com.google.idea.blaze.java",
     test_package_root = "com.google.idea.blaze.java",
     runtime_deps = [

java/src/META-INF/java-contents.xml

@@ -170,5 +170,7 @@
                     interface="com.google.idea.blaze.java.run.hotswap.HotSwapCommandBuilder"/>
     <extensionPoint qualifiedName="com.google.idea.blaze.blazeJavaDebuggingSetupHandler"
                     interface="com.google.idea.blaze.java.run.BlazeJavaDebuggingSetupHandler"/>
+    <extensionPoint qualifiedName="com.google.idea.blaze.FastBuildCompilerExtensionPoint"
+      interface="com.google.idea.blaze.java.fastbuild.FastBuildCompilerExtensionPoint"/>
   </extensionPoints>
 </idea-plugin>

java/src/com/google/idea/blaze/java/JavaBlazeRules.java

@@ -33,6 +33,7 @@ public final class JavaBlazeRules implements Kind.Provider {
   public enum RuleTypes {
     JAVA_LIBRARY("java_library", LanguageClass.JAVA, RuleType.LIBRARY),
     JAVA_TEST("java_test", LanguageClass.JAVA, RuleType.TEST),
+    SCALA_JUNIT_TEST("scala_junit_test", LanguageClass.SCALA, RuleType.TEST),
     JAVA_BINARY("java_binary", LanguageClass.JAVA, RuleType.BINARY),
     JAVA_IMPORT("java_import", LanguageClass.JAVA, RuleType.UNKNOWN),
     JAVA_TOOLCHAIN("java_toolchain", LanguageClass.JAVA, RuleType.UNKNOWN),

java/src/com/google/idea/blaze/java/fastbuild/FastBuildAspectStrategy.java

@@ -69,7 +69,7 @@ final String getAspectOutputGroup() {
   final void addAspectAndOutputGroups(
       BlazeCommand.Builder blazeCommandBuilder, String... additionalOutputGroups) {
     String outputGroups =
-        Stream.concat(Arrays.stream(additionalOutputGroups), Stream.of(OUTPUT_GROUP))
+        Stream.concat(Arrays.stream(additionalOutputGroups).map(s -> "+"+s), Stream.of("+" + OUTPUT_GROUP))
             .collect(joining(","));
     blazeCommandBuilder
         .addBlazeFlags(getAspectFlags())

java/src/com/google/idea/blaze/java/fastbuild/FastBuildBlazeData.java

@@ -59,6 +59,8 @@ public abstract class FastBuildBlazeData {
 
   public abstract Optional<JavaToolchainInfo> javaToolchainInfo();
 
+  public abstract Optional<ProtoInfo> protoInfo();
+
   public static Builder builder() {
     return new AutoValue_FastBuildBlazeData.Builder()
         .setDependencies(ImmutableList.of())
@@ -82,6 +84,8 @@ public abstract static class Builder {
 
     public abstract Builder setJavaToolchainInfo(JavaToolchainInfo javaToolchainInfo);
 
+    public abstract Builder setProtoInfo(ProtoInfo protoInfo);
+
     public abstract FastBuildBlazeData build();
   }
 
@@ -103,6 +107,9 @@ static FastBuildBlazeData fromProto(FastBuildInfo.FastBuildBlazeData proto) {
     if (proto.hasJavaToolchainInfo()) {
       builder.setJavaToolchainInfo(JavaToolchainInfo.fromProto(proto.getJavaToolchainInfo()));
     }
+    if (proto.hasProtoInfo()) {
+      builder.setProtoInfo(ProtoInfo.fromProto(proto.getProtoInfo()));
+    }
     return builder.build();
   }
 
@@ -215,7 +222,7 @@ public abstract Builder setAnnotationProcessorClasspath(
 
   /** Data about a java_toolchain rule. */
   @AutoValue
-  abstract static class JavaToolchainInfo {
+  public abstract static class JavaToolchainInfo {
     public abstract ImmutableList<ArtifactLocation> javacJars();
 
     public abstract ImmutableList<ArtifactLocation> bootClasspathJars();
@@ -224,13 +231,16 @@ abstract static class JavaToolchainInfo {
 
     public abstract String targetVersion();
 
+    public abstract Optional<JavaRuntime> javaRuntime();
+
     static JavaToolchainInfo create(
         ImmutableList<ArtifactLocation> javacJars,
         ImmutableList<ArtifactLocation> bootJars,
         String sourceVersion,
-        String targetVersion) {
+        String targetVersion,
+        JavaRuntime javaRuntime) {
       return new AutoValue_FastBuildBlazeData_JavaToolchainInfo(
-          javacJars, bootJars, sourceVersion, targetVersion);
+          javacJars, bootJars, sourceVersion, targetVersion, Optional.ofNullable(javaRuntime));
     }
 
     static JavaToolchainInfo fromProto(FastBuildInfo.JavaToolchainInfo javaToolchainInfo) {
@@ -242,11 +252,49 @@ static JavaToolchainInfo fromProto(FastBuildInfo.JavaToolchainInfo javaToolchain
           javaToolchainInfo.getBootclasspathJarsList().stream()
               .map(ArtifactLocation::fromProto)
               .collect(toImmutableList());
+      JavaRuntime javaRuntime = null;
+      if (javaToolchainInfo.hasJavaRuntime()) {
+        javaRuntime = JavaRuntime.fromProto(javaToolchainInfo.getJavaRuntime());
+      }
+
       return create(
           javacJars,
           bootJars,
           javaToolchainInfo.getSourceVersion(),
-          javaToolchainInfo.getTargetVersion());
+          javaToolchainInfo.getTargetVersion(), javaRuntime);
+    }
+  }
+  /** Data about a java_runtime rule. */
+  @AutoValue
+  public abstract static class JavaRuntime {
+    public abstract String javaExecutableExecPath();
+
+    static JavaRuntime create(
+        String javaExecutableExecPath) {
+      return new AutoValue_FastBuildBlazeData_JavaRuntime(javaExecutableExecPath);
+    }
+
+    static JavaRuntime fromProto(FastBuildInfo.JavaRuntimeInfo javaRuntime) {
+      return create(javaRuntime.getJavaExecutableExecPath());
+    }
+  }
+
+  /**
+   * Data about a proto_library rule.
+   */
+  @AutoValue
+  public abstract static class ProtoInfo {
+
+    public abstract Set<ArtifactLocation> sources();
+
+    static ProtoInfo create(Set<ArtifactLocation> sources) {
+      return new AutoValue_FastBuildBlazeData_ProtoInfo(sources);
+    }
+
+    static ProtoInfo fromProto(FastBuildInfo.ProtoInfo proto) {
+      Set<ArtifactLocation> sources =
+          proto.getSourcesList().stream().map(ArtifactLocation::fromProto).collect(toSet());
+      return create(sources);
     }
   }
 }