Skip to content

Handle NewClassTree in compareGenericTypeParameterNullabilityForCall(#1212) #1217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msridhar merged 4 commits into from
Jun 4, 2025
Merged

Handle NewClassTree in compareGenericTypeParameterNullabilityForCall(#1212) #1217

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71e1cd9
test case
msridhar May 10, 2025
3e00399
Handle NewClassTree for constructor type substitution in compareGener…
dhruv-agr May 27, 2025
1a3697a
Merge branch 'master' into issue-1212-1
msridhar Jun 4, 2025
e7d9959
added a comment in fix for #1212
dhruv-agr Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions nullaway/src/main/java/com/uber/nullaway/generics/GenericsChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,16 @@ public void compareGenericTypeParameterNullabilityForCall(
TypeSubstitutionUtils.memberType(state.getTypes(), enclosingType, methodSymbol, config);
}
}

// substitute type arguments for constructor call
if (tree instanceof NewClassTree) {
Type enclosingType = getTreeType(tree, config);
Comment thread
dhruv-agr marked this conversation as resolved.
if (enclosingType != null) {
invokedMethodType =
TypeSubstitutionUtils.memberType(state.getTypes(), enclosingType, methodSymbol, config);
}
}

// substitute type arguments for generic methods with explicit type arguments
if (tree instanceof MethodInvocationTree && methodSymbol.type instanceof Type.ForAll) {
invokedMethodType =
Expand Down
30 changes: 30 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/jspecify/GenericsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2388,6 +2388,36 @@ public void newNullableWithArgAndConstructorType() {
.doTest();
}

@Test
public void lambdaToNewNullable() {
makeHelper()
.addSourceLines(
"Foo.java",
"import org.jspecify.annotations.NullMarked;",
"import org.jspecify.annotations.Nullable;",
"@NullMarked",
"class Foo {",
" interface Supplier<T extends @Nullable Object> {",
" T get();",
" }",
" static class SupplierImpl<T2 extends @Nullable Object> implements Supplier<T2> {",
" Supplier<T2> impl;",
" SupplierImpl(Supplier<T2> delegate) {",
" impl = delegate;",
" }",
" @Override",
" public T2 get() {",
" return impl.get();",
" }",
" }",
" static void main() {",
" Supplier<@Nullable Foo> sup = () -> null;",
" new SupplierImpl<@Nullable Foo>(sup);",
" }",
"}")
.doTest();
}

@Test
public void issue1156() {
makeHelper()
Expand Down