[WIP] Preview fix

aspect/intellij_info_impl.bzl

@@ -149,11 +149,19 @@ def get_source_jars(output):
         return [output.source_jar]
     return []
 
-def library_artifact(java_output):
+def get_rule_source_jar(rule):
+    if hasattr(rule.attr, "srcjar"):
+        if rule.attr.srcjar != None:
+            return rule.attr.srcjar.files.to_list()
+    return []
+
+def library_artifact(java_output, rule=None):
     """Creates a LibraryArtifact representing a given java_output."""
     if java_output == None or java_output.class_jar == None:
         return None
     src_jars = get_source_jars(java_output)
+    if rule and not src_jars:
+        src_jars = get_rule_source_jar(rule)
     return struct_omit_none(
         interface_jar = artifact_location(java_output.ijar),
         jar = artifact_location(java_output.class_jar),
@@ -591,7 +599,7 @@ def collect_java_info(target, ctx, semantics, ide_info, ide_info_file, output_gr
 
     ide_info_files = []
     sources = sources_from_target(ctx)
-    jars = [library_artifact(output) for output in java_outputs]
+    jars = [library_artifact(output, ctx.rule) for output in java_outputs]
     class_jars = [output.class_jar for output in java_outputs if output and output.class_jar]
     output_jars = [jar for output in java_outputs for jar in jars_from_output(output)]
     resolve_files = output_jars

aswb/src/META-INF/aswb.xml

@@ -70,6 +70,7 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.google.idea.blaze">
+    <MavenArtifactLocator implementation="com.google.idea.blaze.android.projectsystem.DefaultMavenArtifactLocator"/>
     <LintCollector implementation="com.google.idea.blaze.android.libraries.AndroidLintCollector"/>
     <SyncPlugin implementation="com.google.idea.blaze.android.sync.BlazeAndroidSyncPlugin"/>
     <SyncListener implementation="com.google.idea.blaze.android.sync.BlazeAndroidSyncListener"/>

aswb/src/com/google/idea/blaze/android/compose/ExperimentComposeStatusProvider.java

@@ -24,7 +24,7 @@
  */
 public class ExperimentComposeStatusProvider implements ComposeStatusProvider {
   private static final BoolExperiment composeEnabled =
-      new BoolExperiment("aswb.force.enable.compose", false);
+      new BoolExperiment("aswb.force.enable.compose", true);
 
   @Override
   public boolean composeEnabled(Project project) {

aswb/src/com/google/idea/blaze/android/projectsystem/BlazeModuleSystem.java

@@ -15,8 +15,6 @@
  */
 package com.google.idea.blaze.android.projectsystem;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
-
 import com.android.ide.common.util.PathString;
 import com.android.projectmodel.ExternalAndroidLibrary;
 import com.android.projectmodel.ExternalLibraryImpl;
@@ -26,6 +24,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.idea.blaze.android.libraries.UnpackedAars;
+import com.google.idea.blaze.android.manifest.ManifestParser;
 import com.google.idea.blaze.android.sync.model.AarLibrary;
 import com.google.idea.blaze.android.sync.model.AndroidResourceModuleRegistry;
 import com.google.idea.blaze.android.sync.model.BlazeAndroidSyncData;
@@ -44,15 +43,20 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.stream.Stream;
-import org.jetbrains.annotations.Nullable;
+
+import static com.google.common.collect.ImmutableList.toImmutableList;
 
 /** Blaze implementation of {@link AndroidModuleSystem}. */
 public class BlazeModuleSystem extends BlazeModuleSystemBase {
@@ -166,14 +170,26 @@ static ExternalAndroidLibrary toExternalLibrary(
               library.aarArtifact));
       return null;
     }
+
     File resFolder = unpackedAars.getResourceDirectory(decoder, library);
     PathString resFolderPathString = resFolder == null ? null : new PathString(resFolder);
+    PathString manifest = resFolderPathString == null
+            ? null
+            : resFolderPathString.getParentOrRoot().resolve("AndroidManifest.xml");
+    String resourcePackage = library.resourcePackage;
+    if ((resourcePackage == null || resourcePackage == "") && manifest != null) {
+      try (InputStream is = new FileInputStream(manifest.toFile())) {
+        ManifestParser.ParsedManifest parsedManifest = ManifestParser.parseManifestFromInputStream(is);
+        resourcePackage = parsedManifest.packageName;
+      } catch (IOException ioe) {
+        logger.warn(
+            String.format("Could not parse package from manifest in library %s", aarFile.getName()));
+        return null;
+      }
+    }
     return new ExternalLibraryImpl(library.key.toString())
         .withLocation(new PathString(aarFile))
-        .withManifestFile(
-            resFolderPathString == null
-                ? null
-                : resFolderPathString.getParentOrRoot().resolve("AndroidManifest.xml"))
+        .withManifestFile(manifest)
         .withResFolder(
             resFolderPathString == null
                 ? null
@@ -182,7 +198,7 @@ static ExternalAndroidLibrary toExternalLibrary(
             resFolderPathString == null
                 ? null
                 : resFolderPathString.getParentOrRoot().resolve("R.txt"))
-        .withPackageName(library.resourcePackage);
+        .withPackageName(resourcePackage);
   }
 
   @Override

aswb/src/com/google/idea/blaze/android/projectsystem/BlazeModuleSystemBase.java

@@ -68,6 +68,10 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.ProjectScope;
+import kotlin.Triple;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -78,9 +82,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import kotlin.Triple;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
 
 /** Blaze implementation of {@link AndroidModuleSystem}. */
 @SuppressWarnings("NullableProblems")
@@ -174,8 +175,6 @@ public void registerDependency(GradleCoordinate coordinate, DependencyType type)
     }
 
     // TODO: automagically edit deps instead of just opening the BUILD file?
-    // Need to translate Gradle coordinates into blaze targets.
-    // Will probably need to hardcode for each dependency.
     FileEditorManager fileEditorManager = FileEditorManager.getInstance(project);
     PsiElement buildTargetPsi =
         BuildReferenceManager.getInstance(project).resolveLabel(targetIdeInfo.getKey().getLabel());
@@ -205,6 +204,10 @@ public void registerDependency(GradleCoordinate coordinate, DependencyType type)
     }
   }
 
+  public void clearCache() {
+    classFileFinder.clearCache();
+  }
+
   @Nullable
   @Override
   public GradleCoordinate getRegisteredDependency(GradleCoordinate coordinate) {
@@ -327,7 +330,7 @@ private Stream<TargetKey> locateArtifactsFor(GradleCoordinate coordinate) {
     // labels in order to find them.
     return MavenArtifactLocator.forBuildSystem(Blaze.getBuildSystemName(module.getProject()))
         .stream()
-        .map(locator -> locator.labelFor(coordinate))
+        .map(locator -> locator.labelFor(module.getProject(), coordinate))
         .filter(Objects::nonNull)
         .map(TargetKey::forPlainTarget);
   }

aswb/src/com/google/idea/blaze/android/projectsystem/BlazeProjectSystemBuildManager.java

@@ -15,8 +15,6 @@
  */
 package com.google.idea.blaze.android.projectsystem;
 
-import static java.lang.Math.max;
-
 import com.android.annotations.concurrency.UiThread;
 import com.android.tools.idea.projectsystem.ProjectSystemBuildManager;
 import com.google.idea.blaze.base.build.BlazeBuildListener;
@@ -28,9 +26,12 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.messages.Topic;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.jetbrains.annotations.NotNull;
+
+import static java.lang.Math.max;
 
 /** Blaze implementation of {@link ProjectSystemBuildManager} */
 public class BlazeProjectSystemBuildManager implements ProjectSystemBuildManager {
@@ -51,8 +52,12 @@ public void compileProject() {
   @Override
   public void compileFilesAndDependencies(Collection<? extends VirtualFile> files) {
     // TODO(b/191937319): Implement incremental builds for individual files
-    // Just compile the entire project for now.
-    compileProject();
+    // Do an incremental sync for now so that previews update appropriately
+    //BlazeSyncManager.getInstance(project).workingSetSync("Compile files and dependencies");
+    // TODO: use partialSync with targets verived from `files` (see logic in
+    // BlazeSyncParams.sourceFilesToSync
+    //compileProject();
+    BlazeBuildService.getInstance(project).buildFiles(files);
   }
 
   @Override

aswb/src/com/google/idea/blaze/android/projectsystem/DefaultMavenArtifactLocator.java

@@ -0,0 +1,60 @@
+package com.google.idea.blaze.android.projectsystem;
+
+import com.android.ide.common.repository.GradleCoordinate;
+import com.google.idea.blaze.base.ideinfo.TargetMap;
+import com.google.idea.blaze.base.model.primitives.Label;
+import com.google.idea.blaze.base.settings.BuildSystemName;
+import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+
+public class DefaultMavenArtifactLocator implements MavenArtifactLocator {
+    private static final Logger log = Logger.getInstance(DefaultMavenArtifactLocator.class);
+    private static final String mavenCoordinateTagPrefix = "maven_coordinates=";
+
+    /**
+     * Locate an artifact label by maven coordinates. This is somewhat brittle,
+     * but Android Studio requests specific artifacts needed for their preview
+     * system, so we make our best attempt here to locate them using `maven_install`
+     * patterned bazel artifacts.
+     */
+    public Label labelFor(Project project, GradleCoordinate coordinate) {
+        TargetMap targetMap = BlazeProjectDataManager.getInstance(project)
+            .getBlazeProjectData().getTargetMap();
+
+        String desiredCoord = mavenCoordinateTagPrefix + coordinate.getGroupId() +
+                ":" + coordinate.getArtifactId() + ":";
+        String labelSuffix = String.format(":%s_%s",
+            coordinate.getGroupId().replaceAll("[.-]", "_"),
+            coordinate.getArtifactId().replaceAll("[.-]", "_")
+        );
+
+        // Debug code to list all targets. Some go missing sometimes...
+        /*String debugString = targetMap.map().keySet().stream()
+                .sorted(Comparator.comparing(TargetKey::toString))
+                .map(x -> x.getLabel().toString())
+                .collect(Collectors.joining(", "));
+        System.out.println(debugString);*/
+
+        return targetMap.targets().stream().filter(target -> {
+            for (String tag : target.getTags()) {
+                if (tag.startsWith(desiredCoord)) {
+                    return true;
+                }
+            }
+            return false;
+        })
+            .map(x -> x.getKey().getLabel())
+            .findFirst().orElseGet(() -> {
+                Label bestGuess = Label.create("@maven//" + labelSuffix);
+                log.warn(String.format(
+                        "Could not find exact label for %s, returning best guess of %s",
+                        coordinate, bestGuess));
+                return bestGuess;
+            });
+    }
+
+    public BuildSystemName buildSystem() {
+        return BuildSystemName.Bazel;
+    }
+}

aswb/src/com/google/idea/blaze/android/projectsystem/MavenArtifactLocator.java

@@ -20,6 +20,8 @@
 import com.google.idea.blaze.base.model.primitives.Label;
 import com.google.idea.blaze.base.settings.BuildSystemName;
 import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.project.Project;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -41,7 +43,7 @@ public interface MavenArtifactLocator {
    *
    * @param coordinate GradleCoordinate for the artifact.
    */
-  Label labelFor(GradleCoordinate coordinate);
+  Label labelFor(Project project, GradleCoordinate coordinate);
 
   /** Returns the {@link BuildSystemName} this {@link MavenArtifactLocator} supports. */
   BuildSystemName buildSystem();