Cleaner logic to handle types of extends and implements clause and fi…

…xed `getTypeOfExtendsImplements` (eisop#199)
AndrewShf · Jan 23, 2022 · e790643 · e790643
1 parent 345e7bb
commit e790643
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java
@@ -544,25 +544,15 @@ public void processClassTree(ClassTree classTree) {
 
         Tree ext = classTree.getExtendsClause();
         if (ext != null) {
-            for (AnnotatedDeclaredType superType : classType.directSupertypes()) {
-                if (superType.getUnderlyingType().asElement().getKind().isClass()) {
-                    validateType(ext, superType);
-                    break;
-                }
-            }
+            AnnotatedTypeMirror superClass = atypeFactory.getTypeOfExtendsImplements(ext);
+            validateType(ext, superClass);
         }
 
         List<? extends Tree> impls = classTree.getImplementsClause();
         if (impls != null) {
             for (Tree im : impls) {
-                for (AnnotatedDeclaredType superType : classType.directSupertypes()) {
-                    if (superType.getUnderlyingType().asElement().getKind().isInterface()
-                            && types.isSameType(
-                                    superType.getUnderlyingType(), TreeUtils.typeOf(im))) {
-                        validateType(im, superType);
-                        break;
-                    }
-                }
+                AnnotatedTypeMirror superInterface = atypeFactory.getTypeOfExtendsImplements(im);
+                validateType(im, superInterface);
             }
         }
 

diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
@@ -1414,6 +1414,7 @@ public AnnotatedTypeMirror getTypeOfExtendsImplements(Tree clause) {
         AnnotatedTypeMirror fromTypeTree = fromTypeTree(clause);
         Set<AnnotationMirror> bound = getTypeDeclarationBounds(fromTypeTree.getUnderlyingType());
         fromTypeTree.addMissingAnnotations(bound);
+        addComputedTypeAnnotations(clause, fromTypeTree);
         return fromTypeTree;
     }