Use getSelfType for qualified literal this. Fixes #2208

typetools · Nov 15, 2018 · 80c20b3 · 80c20b3
1 parent 623168e
commit 80c20b3
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/type/TypeFromExpressionVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/TypeFromExpressionVisitor.java
@@ -28,7 +28,6 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedArrayType;
@@ -152,9 +151,8 @@ public AnnotatedTypeMirror visitMemberSelect(MemberSelectTree node, AnnotatedTyp
         }
 
         if (node.getIdentifier().contentEquals("this")) {
-            // TODO: why don't we use getSelfType here?
-            return f.getEnclosingType(
-                    (TypeElement) TreeUtils.elementFromTree(node.getExpression()), node);
+            AnnotatedDeclaredType res = f.getSelfType(node.getExpression());
+            return res;
         } else {
             // node must be a field access, so get the type of the expression, and then call
             // asMemberOf.