jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't apply Java defaulting nullability annotations rules to unbounded wildcards

Browse Source 
^KT-47396 Fixed
This commit is contained in:
Victor Petukhov
2021-07-19 16:26:25 +03:00
committed by teamcityserver
parent 99491014e4
commit f9cb0d61a8
14 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.kt vendored
View File

@@ -26,8 +26,7 @@ fun main(
b.noBoundsNotNull(aNotNullNotNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNotNull<!>)
b.noBoundsNotNull(aNotNullNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)

2
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.fir.txt vendored
View File

@@ -13,7 +13,7 @@ public open class A</*0*/ T : kotlin.Any!, /*1*/ E : @org.jspecify.nullness.Null
public constructor WildcardsWithDefault()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun noBoundsNotNull(/*0*/ a: A<out kotlin.Any, out @org.jspecify.nullness.Nullable kotlin.Any, out @org.jspecify.nullness.NullnessUnspecified kotlin.Any>): kotlin.Unit
public open fun noBoundsNotNull(/*0*/ a: A<out kotlin.Any, *, out @org.jspecify.nullness.NullnessUnspecified kotlin.Any>): kotlin.Unit
public open fun noBoundsNullable(/*0*/ a: A<out @org.jspecify.nullness.Nullable kotlin.Any?, out @org.jspecify.nullness.Nullable kotlin.Any?, out @org.jspecify.nullness.Nullable kotlin.Any?>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}

3
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt vendored
View File

@@ -26,8 +26,7 @@ fun main(
b.noBoundsNotNull(aNotNullNotNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNotNull<!>)
b.noBoundsNotNull(aNotNullNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)

2
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.txt vendored
View File

@@ -13,7 +13,7 @@ public open class A</*0*/ T : kotlin.Any!, /*1*/ E : @org.jspecify.nullness.Null
public constructor WildcardsWithDefault()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun noBoundsNotNull(/*0*/ a: A<out kotlin.Any, out @org.jspecify.nullness.Nullable kotlin.Any, out @org.jspecify.nullness.NullnessUnspecified kotlin.Any>): kotlin.Unit
public open fun noBoundsNotNull(/*0*/ a: A<out kotlin.Any, *, out @org.jspecify.nullness.NullnessUnspecified kotlin.Any>): kotlin.Unit
public open fun noBoundsNullable(/*0*/ a: A<out @org.jspecify.nullness.Nullable kotlin.Any?, out @org.jspecify.nullness.Nullable kotlin.Any?, out @org.jspecify.nullness.Nullable kotlin.Any?>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}

22
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt vendored Normal file
View File

@@ -0,0 +1,22 @@
// JSPECIFY_STATE: strict
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
// MUTE_FOR_PSI_CLASS_FILES_READING
// FILE: Foo.java
import org.jspecify.nullness.*;
@NullMarked
public interface Foo {
void test(Bar<?> list);
}
// FILE: Bar.java
import org.jspecify.nullness.*;
@NullMarked
public interface Bar<E extends @Nullable Object> {}
// FILE: main.kt
fun test(foo: Foo, bar: Bar<String?>) {
foo.test(<!DEBUG_INFO_EXPRESSION_TYPE("Bar<kotlin.String?>")!>bar<!>)
}

16
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.txt vendored Normal file
View File

@@ -0,0 +1,16 @@
package
public fun test(/*0*/ foo: Foo, /*1*/ bar: Bar<kotlin.String?>): kotlin.Unit
@org.jspecify.nullness.NullMarked public interface Bar</*0*/ E> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@org.jspecify.nullness.NullMarked public interface Foo {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun test(/*0*/ list: Bar<*>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}

1
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.kt vendored
View File

@@ -1,6 +1,7 @@
// JSPECIFY_STATE: strict
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
// MUTE_FOR_PSI_CLASS_FILES_READING
// FILE: Foo.java
import org.jspecify.nullness.*;

1
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.kt vendored
View File

@@ -1,5 +1,6 @@
// JSPECIFY_STATE: strict
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
// MUTE_FOR_PSI_CLASS_FILES_READING
// FILE: Foo.java
import org.jspecify.nullness.*;

3
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.fir.kt vendored
View File

@@ -26,8 +26,7 @@ fun main(
b.noBoundsNotNull(aNotNullNotNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNotNull<!>)
b.noBoundsNotNull(aNotNullNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)

3
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt vendored
View File

@@ -26,8 +26,7 @@ fun main(
b.noBoundsNotNull(aNotNullNotNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNotNull<!>)
b.noBoundsNotNull(aNotNullNullNotNull)
// jspecify_nullness_mismatch
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaTestGenerated.java generated
View File

@@ -654,6 +654,12 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
}
@Test
@TestMetadata("kt47396.kt")
public void testKt47396() throws Exception {
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt");
}
@Test
@TestMetadata("kt47422.kt")
public void testKt47422() throws Exception {

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated.java generated
View File

@@ -654,6 +654,12 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
}
@Test
@TestMetadata("kt47396.kt")
public void testKt47396() throws Exception {
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt");
}
@Test
@TestMetadata("kt47422.kt")
public void testKt47422() throws Exception {

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ForeignAnnotationsSourceJavaTestGenerated.java generated
View File

@@ -654,6 +654,12 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
}
@Test
@TestMetadata("kt47396.kt")
public void testKt47396() throws Exception {
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt");
}
@Test
@TestMetadata("kt47422.kt")
public void testKt47422() throws Exception {

8
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
View File

@@ -358,7 +358,8 @@ class SignatureEnhancement(
?: computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
nullabilityFromBoundsForTypeBasedOnTypeParameter,
defaultTypeQualifier,
typeParameterForArgument
typeParameterForArgument,
isFromStarProjection
)
val isNotNullTypeParameter =
@@ -385,7 +386,8 @@ class SignatureEnhancement(
private fun computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
nullabilityFromBoundsForTypeBasedOnTypeParameter: NullabilityQualifierWithMigrationStatus?,
defaultTypeQualifier: JavaDefaultQualifiers?,
typeParameterForArgument: TypeParameterDescriptor?
typeParameterForArgument: TypeParameterDescriptor?,
isFromStarProjection: Boolean
): NullabilityQualifierWithMigrationStatus? {
val result =
@@ -406,7 +408,7 @@ class SignatureEnhancement(
)
}
if (result == null) return boundsFromTypeParameterForArgument
if (result == null || isFromStarProjection) return boundsFromTypeParameterForArgument
return mostSpecific(boundsFromTypeParameterForArgument, result)
}