Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Factor out WholeProgramInferenceJavaParserStorage#isInvisible #5196

Merged
merged 8 commits into from Jul 7, 2022
Merged

Factor out WholeProgramInferenceJavaParserStorage#isInvisible #5196

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55e2d72
ajava-based inference should not print invisible qualifiers, and make…
kelloggm Jun 30, 2022
b80ddd1
remove invisible qualifiers from JTREG test
kelloggm Jun 30, 2022
a850ee9
fix another jtreg test
kelloggm Jun 30, 2022
9b2b806
Merge branch 'master' of github.com:typetools/checker-framework into …
kelloggm Jul 6, 2022
9f9bc53
factor out getting the invisible qualifier names into a static method
kelloggm Jul 6, 2022
566045b
fix typo
kelloggm Jul 6, 2022
f474b5b
factor out isInvisible, too
kelloggm Jul 7, 2022
3c645ed
merge
kelloggm Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions ...checkerframework/common/wholeprograminference/WholeProgramInferenceJavaParserStorage.java
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
Expand Down Expand Up @@ -123,14 +124,22 @@ public class WholeProgramInferenceJavaParserStorage
*/
public static Set<String> getInvisibleQualifierNames(AnnotatedTypeFactory atypeFactory) {
return atypeFactory.getSupportedTypeQualifiers().stream()
.filter(
qual ->
Arrays.stream(qual.getAnnotations())
.anyMatch(anno -> anno.annotationType() == InvisibleQualifier.class))
.filter(WholeProgramInferenceJavaParserStorage::isInvisible)
.map(Class::getCanonicalName)
.collect(Collectors.toSet());
}

/**
* Is the definition of the given annotation class annotated with {@link InvisibleQualifier}?
*
* @param qual an annotation class
* @return true iff {@code qual} is meta-annotated with {@link InvisibleQualifier}
*/
public static boolean isInvisible(Class<? extends Annotation> qual) {
return Arrays.stream(qual.getAnnotations())
.anyMatch(anno -> anno.annotationType() == InvisibleQualifier.class);
}

/**
* Constructs a new {@code WholeProgramInferenceJavaParser} that has not yet inferred any
* annotations.
Expand Down