-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce a
NullSpecTypeValidator to ensure unspecified type variab…
…les are ok (#178)
- Loading branch information
Showing
7 changed files
with
90 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
src/main/java/com/google/jspecify/nullness/NullSpecTypeValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // Copyright 2020 The JSpecify Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.jspecify.nullness; | ||
|
|
||
| import javax.lang.model.element.AnnotationMirror; | ||
| import org.checkerframework.common.basetype.BaseTypeChecker; | ||
| import org.checkerframework.common.basetype.BaseTypeValidator; | ||
| import org.checkerframework.framework.type.AnnotatedTypeMirror; | ||
|
|
||
| final class NullSpecTypeValidator extends BaseTypeValidator { | ||
| private final AnnotationMirror nullnessOperatorUnspecified; | ||
|
|
||
| /** Constructor. */ | ||
| NullSpecTypeValidator( | ||
| BaseTypeChecker checker, | ||
| NullSpecVisitor visitor, | ||
| NullSpecAnnotatedTypeFactory atypeFactory, | ||
| Util util) { | ||
| super(checker, visitor, atypeFactory); | ||
|
|
||
| nullnessOperatorUnspecified = util.nullnessOperatorUnspecified; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean areBoundsValid(AnnotatedTypeMirror upperBound, AnnotatedTypeMirror lowerBound) { | ||
| if (upperBound.hasAnnotation(nullnessOperatorUnspecified) | ||
| || lowerBound.hasAnnotation(nullnessOperatorUnspecified)) { | ||
| return true; | ||
| } else { | ||
| return super.areBoundsValid(upperBound, lowerBound); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright 2024 The JSpecify Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Test case for Issue 177: | ||
| // https://github.com/jspecify/jspecify-reference-checker/issues/177 | ||
|
|
||
| class Issue177<T> {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,10 @@ class Issue172<E> { | |
| E e() { | ||
| return null; | ||
| } | ||
|
|
||
| void p(E p) { | ||
| p = null; | ||
| } | ||
| } | ||
|
|
||
| class Issue172UnmarkedUse { | ||
|
|
||