Skip to content

Commit 4a96a23

Browse files
ignore output folder when processing annotations and parsing ASTs
1 parent a55bb05 commit 4a96a23

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/main/java/anthonisen/felix/annotationProcessing/VarianceProcessor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
3636
messager.printMessage(Kind.NOTE, "Processing annotations:\n");
3737
for (Element e : roundEnv.getElementsAnnotatedWith(MyVariance.class)) {
3838
MyVariance annotation = e.getAnnotation(MyVariance.class);
39+
String packageName = processingEnv.getElementUtils().getPackageOf(e).toString();
40+
if (packageName.contains("output"))
41+
continue;
3942
messager.printMessage(Kind.NOTE, e.getEnclosingElement().getKind().name());
4043

4144
// should not process method declarations
@@ -50,7 +53,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
5053
"Invariant type parameter detected in class: %s\nWill not proceed with AST manipulation",
5154
className));
5255
}
53-
String packageName = processingEnv.getElementUtils().getPackageOf(e).toString();
56+
5457
checkVariance(className, annotation.variance(), packageName);
5558
covariancer.makeCovariant(className + ".java", packageName);
5659

src/main/java/anthonisen/felix/astParsing/Covariancer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ private Set<ClassData> computeClassesToWatch(File dir, String packageName) {
5757
Set<ClassData> classesToWatch = new HashSet<>();
5858
for (File file : dir.listFiles()) {
5959
if (file.isDirectory()) {
60-
classesToWatch
61-
.addAll(computeClassesToWatch(file, appendPackageDeclaration(packageName, file.getName())));
60+
if (!file.getName().equals("output"))
61+
classesToWatch
62+
.addAll(computeClassesToWatch(file, appendPackageDeclaration(packageName, file.getName())));
6263
continue;
6364
}
6465
CompilationUnit cu = sourceRoot.parse(packageName, file.getName());
@@ -71,7 +72,8 @@ private void changeAST(File dir, Set<ClassData> classesToWatch, Map<String, Meth
7172
String packageName) {
7273
for (File file : dir.listFiles()) {
7374
if (file.isDirectory()) {
74-
changeAST(file, classesToWatch, methodMap, appendPackageDeclaration(packageName, file.getName()));
75+
if (!file.getName().equals("output"))
76+
changeAST(file, classesToWatch, methodMap, appendPackageDeclaration(packageName, file.getName()));
7577
continue;
7678
}
7779
if (!isJavaFile(file))

0 commit comments

Comments
 (0)