Fix position of marker for dereference of nullable errors

eisop · Mar 20, 2023 · a3bb7ac · a3bb7ac
1 parent 17826a7
commit a3bb7ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java b/checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java
@@ -271,7 +271,8 @@ public Void visitMemberSelect(MemberSelectTree tree, Void p) {
                 || tree.getExpression().getKind() == Tree.Kind.PARAMETERIZED_TYPE
                 // case 8. static member access
                 || ElementUtils.isStatic(e))) {
-            checkForNullability(tree.getExpression(), DEREFERENCE_OF_NULLABLE);
+            AnnotatedTypeMirror type = atypeFactory.getAnnotatedType(tree.getExpression());
+            checkForNullability(type, tree.getExpression(), DEREFERENCE_OF_NULLABLE);
         }
 
         return super.visitMemberSelect(tree, p);
@@ -743,7 +744,8 @@ public Void visitForLoop(ForLoopTree tree, Void p) {
     public Void visitNewClass(NewClassTree tree, Void p) {
         ExpressionTree enclosingExpr = tree.getEnclosingExpression();
         if (enclosingExpr != null) {
-            checkForNullability(enclosingExpr, DEREFERENCE_OF_NULLABLE);
+            AnnotatedTypeMirror type = atypeFactory.getAnnotatedType(enclosingExpr);
+            checkForNullability(type, enclosingExpr, DEREFERENCE_OF_NULLABLE);
         }
         AnnotatedDeclaredType type = atypeFactory.getAnnotatedType(tree);
         ExpressionTree identifier = tree.getIdentifier();

diff --git a/docs/manual/contributors.tex b/docs/manual/contributors.tex
@@ -136,4 +136,5 @@
 Vlastimil Dort,
 Weitian Xing,
 Werner Dietl,
+Wuyue (Tony) Sun,
 Zhiping Cai.