Tweaks

PicnicSupermarket · Sep 23, 2022 · 3b232c3 · 3b232c3
1 parent b69750f
commit 3b232c3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 28 deletions.
diff --git a/...rc/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java b/...rc/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java
@@ -69,25 +69,6 @@ public void finished(TaskEvent taskEvent) {
     }
   }
 
-  private boolean containsRefasterTemplates(ClassTree tree) {
-    return Boolean.TRUE.equals(
-        new TreeScanner<Boolean, Void>() {
-          @Override
-          public Boolean visitAnnotation(AnnotationTree node, @Nullable Void v) {
-            Symbol sym = ASTHelpers.getSymbol(node);
-            return (sym != null
-                    && sym.getQualifiedName()
-                        .contentEquals(BeforeTemplate.class.getCanonicalName()))
-                || super.visitAnnotation(node, v);
-          }
-
-          @Override
-          public Boolean reduce(Boolean r1, Boolean r2) {
-            return Boolean.TRUE.equals(r1) || Boolean.TRUE.equals(r2);
-          }
-        }.scan(tree, null));
-  }
-
   private ImmutableMap<ClassTree, CodeTransformer> compileRefasterTemplates(ClassTree tree) {
     ImmutableMap.Builder<ClassTree, CodeTransformer> rules = ImmutableMap.builder();
     new TreeScanner<Void, ImmutableClassToInstanceMap<Annotation>>() {
@@ -112,15 +93,6 @@ public Void visitClass(ClassTree node, ImmutableClassToInstanceMap<Annotation> a
     return rules.buildOrThrow();
   }
 
-  // XXX: Move down?
-  private static ImmutableClassToInstanceMap<Annotation> merge(
-      ImmutableClassToInstanceMap<Annotation> left, ImmutableClassToInstanceMap<Annotation> right) {
-    return ImmutableClassToInstanceMap.<Annotation>builder()
-        .putAll(Maps.filterKeys(left, k -> !right.containsKey(k)))
-        .putAll(right)
-        .build();
-  }
-
   private FileObject getOutputFile(TaskEvent taskEvent, ClassTree tree) throws IOException {
     ClassSymbol symbol = ASTHelpers.getSymbol(tree);
     PackageSymbol enclosingPackage = ASTHelpers.enclosingPackage(symbol);
@@ -132,6 +104,35 @@ private FileObject getOutputFile(TaskEvent taskEvent, ClassTree tree) throws IOE
         StandardLocation.CLASS_OUTPUT, packageName, relativeName, taskEvent.getSourceFile());
   }
 
+  private static boolean containsRefasterTemplates(ClassTree tree) {
+    return Boolean.TRUE.equals(
+        new TreeScanner<Boolean, Void>() {
+          @Override
+          public Boolean visitAnnotation(AnnotationTree node, @Nullable Void unused) {
+            Symbol sym = ASTHelpers.getSymbol(node);
+            return (sym != null
+                    && sym.getQualifiedName()
+                        .contentEquals(BeforeTemplate.class.getCanonicalName()))
+                || super.visitAnnotation(node, unused);
+          }
+
+          @Override
+          public Boolean reduce(Boolean r1, Boolean r2) {
+            return Boolean.TRUE.equals(r1) || Boolean.TRUE.equals(r2);
+          }
+        }.scan(tree, null));
+  }
+
+  /** Merges two annotation mappings, preferring the second over the first in case of conflicts. */
+  private static ImmutableClassToInstanceMap<Annotation> merge(
+      ImmutableClassToInstanceMap<Annotation> first,
+      ImmutableClassToInstanceMap<Annotation> second) {
+    return ImmutableClassToInstanceMap.<Annotation>builder()
+        .putAll(Maps.filterKeys(first, k -> !second.containsKey(k)))
+        .putAll(second)
+        .build();
+  }
+
   private static CharSequence toSimpleFlatName(ClassSymbol classSymbol) {
     Name flatName = classSymbol.flatName();
     int lastDot = flatName.lastIndexOf((byte) '.');

diff --git a/refaster-runner/pom.xml b/refaster-runner/pom.xml
@@ -37,6 +37,14 @@
             `annotationProcessorPaths` configuration below. -->
             <scope>provided</scope>
         </dependency>
+        <!-- XXX: Maybe it's better if we move
+        `AnnotatedCompositeCodeTransformer` to `refaster-compiler` and drop the
+        `provided` above. -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>refaster-support</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service-annotations</artifactId>