From 1bbb1366145029c39bf8174de2516a0d6511a859 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Tue, 2 Feb 2021 14:09:44 -0800
Subject: [PATCH] Include all simple names present in source for error types

When creating error types to model invalid elements during annotation processing,
include all simple names present in source for qualified names, instead of
just the last one.

This fixes https://github.com/bazelbuild/bazel/issues/12926

PiperOrigin-RevId: 355249091
---
 .../turbine/processing/TurbineElement.java    | 12 +++--
 .../processing/ProcessingIntegrationTest.java | 46 +++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/java/com/google/turbine/processing/TurbineElement.java b/java/com/google/turbine/processing/TurbineElement.java
index a9e328a6..863f8c95 100644
--- a/java/com/google/turbine/processing/TurbineElement.java
+++ b/java/com/google/turbine/processing/TurbineElement.java
@@ -47,6 +47,7 @@
 import com.google.turbine.model.Const.ArrayInitValue;
 import com.google.turbine.model.TurbineFlag;
 import com.google.turbine.model.TurbineTyKind;
+import com.google.turbine.tree.Tree;
 import com.google.turbine.tree.Tree.MethDecl;
 import com.google.turbine.tree.Tree.TyDecl;
 import com.google.turbine.tree.Tree.VarDecl;
@@ -262,11 +263,16 @@ public TypeMirror get() {
                       return factory.asTypeMirror(info.superClassType());
                     }
                     if (info instanceof SourceTypeBoundClass) {
-                      // support simple name for stuff that doesn't exist
+                      // support simple names for stuff that doesn't exist
                       TyDecl decl = ((SourceTypeBoundClass) info).decl();
                       if (decl.xtnds().isPresent()) {
-                        return factory.asTypeMirror(
-                            ErrorTy.create(decl.xtnds().get().name().value()));
+                        ArrayDeque<Tree.Ident> flat = new ArrayDeque<>();
+                        for (Tree.ClassTy curr = decl.xtnds().get();
+                            curr != null;
+                            curr = curr.base().orElse(null)) {
+                          flat.addFirst(curr.name());
+                        }
+                        return factory.asTypeMirror(ErrorTy.create(flat));
                       }
                     }
                     return factory.noType();
diff --git a/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java b/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java
index f6a00d20..0774bf46 100644
--- a/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java
+++ b/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
 import static org.junit.Assert.fail;
@@ -509,6 +510,51 @@ public void generatedAnnotationDefinition() throws IOException {
     assertThat(bound.generatedSources()).containsKey("A.java");
   }
 
+  @SupportedAnnotationTypes("*")
+  public static class GenerateQualifiedProcessor extends AbstractProcessor {
+
+    @Override
+    public SourceVersion getSupportedSourceVersion() {
+      return SourceVersion.latestSupported();
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+      String superType =
+          processingEnv.getElementUtils().getTypeElement("T").getSuperclass().toString();
+      processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, superType);
+      return false;
+    }
+  }
+
+  @Test
+  public void qualifiedErrorType() throws IOException {
+    ImmutableList<Tree.CompUnit> units =
+        parseUnit(
+            "=== T.java ===", //
+            "class T extends G.I {",
+            "}");
+    try {
+      Binder.bind(
+          units,
+          ClassPathBinder.bindClasspath(ImmutableList.of()),
+          ProcessorInfo.create(
+              ImmutableList.of(new GenerateQualifiedProcessor()),
+              getClass().getClassLoader(),
+              ImmutableMap.of(),
+              SourceVersion.latestSupported()),
+          TestClassPaths.TURBINE_BOOTCLASSPATH,
+          Optional.empty());
+      fail();
+    } catch (TurbineError e) {
+      assertThat(
+              e.diagnostics().stream()
+                  .filter(d -> d.severity().equals(Diagnostic.Kind.NOTE))
+                  .map(d -> d.message()))
+          .containsExactly("G.I");
+    }
+  }
+
   private static ImmutableList<Tree.CompUnit> parseUnit(String... lines) {
     return IntegrationTestSupport.TestInput.parse(Joiner.on('\n').join(lines))
         .sources