Improve addEnclosingTypesToImportedTypes (#6565)

typetools · May 2, 2024 · f5e19d3 · f5e19d3
1 parent d62429e
commit f5e19d3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileParser.java b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileParser.java
@@ -555,15 +555,15 @@ private Map<String, TypeElement> getImportedAnnotations() {
               // Find compile time constant fields, or values of an enum
               putAllNew(result, annosInType(element));
               importedConstants.addAll(getImportableMembers(element));
-              addEnclosingTypesToImportedTypes(element);
+              addEnclosedTypesToImportedTypes(element);
             }
 
           } else {
             // Wildcard import of members of a package
             PackageElement element = findPackage(imported, importDecl);
             if (element != null) {
               putAllNew(result, annosInPackage(element));
-              addEnclosingTypesToImportedTypes(element);
+              addEnclosedTypesToImportedTypes(element);
             }
           }
         } else {
@@ -626,10 +626,14 @@ private Map<String, TypeElement> getImportedAnnotations() {
     return result;
   }
 
-  // If a member is imported, then consider every containing class to also be imported.
-  private void addEnclosingTypesToImportedTypes(Element element) {
+  /**
+   * Handle wildcard imports by adding, to {@link #importedTypes}, every enclosed type.
+   *
+   * @param element an element for a type or package
+   */
+  private void addEnclosedTypesToImportedTypes(Element element) {
     for (Element enclosedEle : element.getEnclosedElements()) {
-      if (enclosedEle.getKind().isClass()) {
+      if (enclosedEle.getKind().isClass() || enclosedEle.getKind().isInterface()) {
         importedTypes.put(enclosedEle.getSimpleName().toString(), (TypeElement) enclosedEle);
       }
     }