Consider nullable annotations in explicit nulls #21953
Open
+96
−6
Conversation
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
noti0na1
requested changes
Nov 18, 2024
| @@ -1125,6 +1125,11 @@ class Definitions { | |||
| "reactor.util.annotation.NonNullApi" :: | |||
| "io.reactivex.annotations.NonNull" :: Nil) | |||
|
|
|||
| @tu lazy val NullableAnnots: List[ClassSymbol] = getClassesIfDefined( | |||
There was a problem hiding this comment.
Can we copy the full list from kotlin and update our existing list NotNullAnnots as well: https://github.com/JetBrains/kotlin/blob/master/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
| return as; | ||
| } | ||
|
|
||
| @Nullable |
There was a problem hiding this comment.
We should test annotations at parameter positions as well: f(@NotNull String s), g(@Nullable String s)
| return "k"; | ||
| } | ||
|
|
||
| @Nullable |
There was a problem hiding this comment.
Let's also test the annotation after modifiers: public @Nullable String s = ...
| @@ -95,8 +98,17 @@ object JavaNullInterop { | |||
| * This is useful for e.g. constructors, and also so that `A & B` is nullified | |||
| * to `(A & B) | Null`, instead of `(A | Null & B | Null) | Null`. | |||
| */ | |||
| private class JavaNullMap(var outermostLevelAlreadyNullable: Boolean)(using Context) extends TypeMap { | |||
| def nullify(tp: Type): Type = if ctx.flexibleTypes then FlexibleType(tp) else OrNull(tp) | |||
| private class JavaNullMap(var outermostLevelAlreadyNullable: Boolean, explicitlyNullable: Boolean)(using Context) extends TypeMap { | |||
There was a problem hiding this comment.
I don't think the NotNull/Nullable annotation on the symbol should affect any types nested inside.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21629
Not sure if the tests are sufficient.