Skip to content
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

Jump to bottom

JSpecify: handling the return of a diamond operator anonymous object method caller #858

Merged
merged 7 commits into from
Nov 13, 2023
Merged

JSpecify: handling the return of a diamond operator anonymous object method caller #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95d3e8e
Adding test case and relevant logic to handle when a returned diamond…
akulk022 Nov 9, 2023
e044d28
Merge branch 'master' into jspecify_diamond_operator_method_caller_ab…
msridhar Nov 11, 2023
f3248b5
adding logic to bail out if we get null from returnTreeType
akulk022 Nov 12, 2023
1e98cbc
Merge remote-tracking branch 'origin/jspecify_diamond_operator_method…
akulk022 Nov 12, 2023
7b0d5dd
removing redundant call to getTreeType
akulk022 Nov 12, 2023
4aac75e
removing unnecessary call to castToNonNull
akulk022 Nov 12, 2023
35c0cc3
Minor tweak
msridhar Nov 13, 2023
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
11 changes: 7 additions & 4 deletions nullaway/src/main/java/com/uber/nullaway/GenericsChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,13 @@ public static Nullness getGenericReturnNullnessAtInvocation(
return Nullness.NONNULL;
}
Type methodReceiverType =
castToNonNull(
getTreeType(((MemberSelectTree) tree.getMethodSelect()).getExpression(), state));
return getGenericMethodReturnTypeNullness(
invokedMethodSymbol, methodReceiverType, state, config);
getTreeType(((MemberSelectTree) tree.getMethodSelect()).getExpression(), state);
if (methodReceiverType == null) {
return Nullness.NONNULL;
} else {
return getGenericMethodReturnTypeNullness(
invokedMethodSymbol, methodReceiverType, state, config);
}
}

/**
Expand Down
18 changes: 18 additions & 0 deletions nullaway/src/test/java/com/uber/nullaway/NullAwayJSpecifyGenericsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,24 @@ public void testForStaticMethodCallAsAParam() {
.doTest();
}

@Test
public void testForDiamondOperatorReturnedAsAMethodCaller() {
makeHelper()
.addSourceLines(
"Test.java",
"package com.uber;",
"import org.jspecify.annotations.Nullable;",
"class Test {",
" static class B<T>{",
" String build(){return \"x\";}",
" }",
" static String testNegative() {",
" return new B<>().build();",
" }",
"}")
.doTest();
}

private CompilationTestHelper makeHelper() {
return makeTestHelperWithArgs(
Arrays.asList(
Expand Down