Merge branch 'master' into wildcard-experiment

Author: msridhar

CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+Version 0.13.3
+--------------
+
+Quick follow-up release to 0.13.2 to fix a crash (#1523).
+
+* Add @InjectSoftAssertions to default excluded field annotations by @is-ivanov (#1516)
+* Fix check for enclosing `NewClassTree` (#1524)
+* Maintenance
+  - Remove `onOverrideMethodInvocationVarargsArrayNullability` handler method (#1518)
+  - Update to Checker Framework 4.0.0 (#1519)
+
 Version 0.13.2
 --------------
 

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
 
 GROUP=com.uber.nullaway
-VERSION_NAME=0.13.3-SNAPSHOT
+VERSION_NAME=0.13.4-SNAPSHOT
 
 POM_DESCRIPTION=A fast annotation-based null checker for Java
 

nullaway/src/main/java/com/uber/nullaway/generics/GenericsChecks.java

@@ -1756,28 +1756,35 @@ public Nullness getGenericMethodReturnTypeNullness(
   private @Nullable Type getTypeForSymbol(Symbol symbol, VisitorState state) {
     if (symbol.isAnonymous()) {
       // For anonymous classes, symbol.type does not contain annotations on generic type parameters.
-      // So, we get a correct type from the enclosing NewClassTree representing the anonymous class.
+      // So, we get a correct type from the NewClassTree representing the anonymous class.
+      // The nearest enclosing NewClassTree on the current path may be some other constructor call,
+      // such as when `this` from an anonymous class is passed as an argument to a constructor.
       TreePath path = state.getPath();
-      path =
-          castToNonNull(ASTHelpers.findPathFromEnclosingNodeToTopLevel(path, NewClassTree.class));
-      NewClassTree newClassTree = (NewClassTree) path.getLeaf();
-      if (newClassTree.getClassBody() == null) {
-        throw new RuntimeException(
-            "method should be directly inside an anonymous NewClassTree "
-                + state.getSourceForNode(path.getLeaf()));
-      }
-      Type typeFromTree = getTreeType(newClassTree, state);
-      if (typeFromTree != null) {
-        verify(
-            state.getTypes().isAssignable(symbol.type, typeFromTree),
-            "%s is not assignable to %s",
-            symbol.type,
-            typeFromTree);
+      while (path != null) {
+        if (path.getLeaf() instanceof NewClassTree newClassTree
+            && newClassTree.getClassBody() != null) {
+          Type newClassType = ASTHelpers.getType(newClassTree);
+          if (newClassType != null && newClassType.tsym.equals(symbol)) {
+            Type typeFromTree = getTreeType(newClassTree, state);
+            if (typeFromTree != null) {
+              verify(
+                  state.getTypes().isAssignable(symbol.type, typeFromTree),
+                  "%s is not assignable to %s",
+                  symbol.type,
+                  typeFromTree);
+            }
+            return typeFromTree;
+          }
+        }
+        path = path.getParentPath();
       }
-      return typeFromTree;
-    } else {
-      return symbol.type;
+      throw new RuntimeException(
+          "could not find anonymous NewClassTree for symbol "
+              + symbol
+              + " from path "
+              + state.getSourceForNode(state.getPath().getLeaf()));
     }
+    return symbol.type;
   }
 
   public Nullness getGenericMethodReturnTypeNullness(

nullaway/src/test/java/com/uber/nullaway/jspecify/GenericsTests.java

@@ -1653,6 +1653,32 @@ interface TestInterface<T extends @Nullable Object> {
         .doTest();
   }
 
+  @Test
+  public void constructorCallWithThisFromAnonymousClass() {
+    makeHelper()
+        .addSourceLines(
+            "Test.java",
+            """
+            package com.uber;
+            import org.jspecify.annotations.NullMarked;
+            @NullMarked
+            class Test {
+              static class TakesRunnable {
+                TakesRunnable(Runnable runnable) {}
+              }
+              void repro() {
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    new TakesRunnable(this);
+                  }
+                };
+              }
+            }
+            """)
+        .doTest();
+  }
+
   @Test
   public void explicitlyTypedAnonymousClassAsReceiver() {
     makeHelper()