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

Remove need to use JSpecify's @Nullable annotation #1142

Merged
merged 10 commits into from
Feb 7, 2025
Merged

Remove need to use JSpecify's @Nullable annotation #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
213bb4b
test but it already passes
msridhar Jan 31, 2025
303e267
Merge branch 'master' into issue-1139
msridhar Feb 5, 2025
9b20e8e
WIP
msridhar Feb 5, 2025
361b5f1
fix
msridhar Feb 7, 2025
93d3dd6
tests pass
msridhar Feb 7, 2025
6f6aefe
more
msridhar Feb 7, 2025
5476215
extract local
msridhar Feb 7, 2025
861c5e1
extract local
msridhar Feb 7, 2025
f855865
re-add test
msridhar Feb 7, 2025
3ef0323
add comment
msridhar Feb 7, 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
13 changes: 8 additions & 5 deletions nullaway/src/main/java/com/uber/nullaway/generics/CheckIdenticalNullabilityVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.errorprone.VisitorState;
import com.sun.tools.javac.code.Type;
import com.sun.tools.javac.code.Types;
import com.uber.nullaway.Config;
import java.util.List;
import javax.lang.model.type.NullType;
import javax.lang.model.type.TypeKind;
Expand All @@ -14,9 +15,11 @@
*/
public class CheckIdenticalNullabilityVisitor extends Types.DefaultTypeVisitor<Boolean, Type> {
private final VisitorState state;
private final Config config;

CheckIdenticalNullabilityVisitor(VisitorState state) {
CheckIdenticalNullabilityVisitor(VisitorState state, Config config) {
this.state = state;
this.config = config;
}

@Override
Expand Down Expand Up @@ -60,8 +63,8 @@ public Boolean visitClassType(Type.ClassType lhsType, Type rhsType) {
// TODO Handle wildcard types
continue;
}
boolean isLHSNullableAnnotated = GenericsChecks.isNullableAnnotated(lhsTypeArgument, state);
boolean isRHSNullableAnnotated = GenericsChecks.isNullableAnnotated(rhsTypeArgument, state);
boolean isLHSNullableAnnotated = GenericsChecks.isNullableAnnotated(lhsTypeArgument, config);
boolean isRHSNullableAnnotated = GenericsChecks.isNullableAnnotated(rhsTypeArgument, config);
if (isLHSNullableAnnotated != isRHSNullableAnnotated) {
return false;
}
Expand Down Expand Up @@ -91,8 +94,8 @@ public Boolean visitArrayType(Type.ArrayType lhsType, Type rhsType) {
Type.ArrayType arrRhsType = (Type.ArrayType) rhsType;
Type lhsComponentType = lhsType.getComponentType();
Type rhsComponentType = arrRhsType.getComponentType();
boolean isLHSNullableAnnotated = GenericsChecks.isNullableAnnotated(lhsComponentType, state);
boolean isRHSNullableAnnotated = GenericsChecks.isNullableAnnotated(rhsComponentType, state);
boolean isLHSNullableAnnotated = GenericsChecks.isNullableAnnotated(lhsComponentType, config);
boolean isRHSNullableAnnotated = GenericsChecks.isNullableAnnotated(rhsComponentType, config);
if (isRHSNullableAnnotated != isLHSNullableAnnotated) {
return false;
}
Expand Down
Loading