Don't apply Java defaulting nullability annotations rules to unbounded wildcards
^KT-47396 Fixed
This commit is contained in:
committed by
teamcityserver
parent
99491014e4
commit
f9cb0d61a8
+1
-2
@@ -26,8 +26,7 @@ fun main(
|
|||||||
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
|
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
|
||||||
// jspecify_nullness_mismatch
|
b.noBoundsNotNull(aNotNullNullNotNull)
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNotNull<!>)
|
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)
|
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ public open class A</*0*/ T : kotlin.Any!, /*1*/ E : @org.jspecify.nullness.Null
|
|||||||
public constructor WildcardsWithDefault()
|
public constructor WildcardsWithDefault()
|
||||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
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 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 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
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -26,8 +26,7 @@ fun main(
|
|||||||
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
|
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNotNullNull<!>)
|
||||||
// jspecify_nullness_mismatch
|
b.noBoundsNotNull(aNotNullNullNotNull)
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNotNull<!>)
|
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)
|
b.noBoundsNotNull(<!TYPE_MISMATCH!>aNotNullNullNull<!>)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ public open class A</*0*/ T : kotlin.Any!, /*1*/ E : @org.jspecify.nullness.Null
|
|||||||
public constructor WildcardsWithDefault()
|
public constructor WildcardsWithDefault()
|
||||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
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 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 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
|
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+22
@@ -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<!>)
|
||||||
|
}
|
||||||
Vendored
+16
@@ -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
|
||||||
|
}
|
||||||
Vendored
+1
@@ -1,6 +1,7 @@
|
|||||||
// JSPECIFY_STATE: strict
|
// JSPECIFY_STATE: strict
|
||||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
||||||
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
|
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
|
||||||
|
// MUTE_FOR_PSI_CLASS_FILES_READING
|
||||||
|
|
||||||
// FILE: Foo.java
|
// FILE: Foo.java
|
||||||
import org.jspecify.nullness.*;
|
import org.jspecify.nullness.*;
|
||||||
|
|||||||
Vendored
+1
@@ -1,5 +1,6 @@
|
|||||||
// JSPECIFY_STATE: strict
|
// JSPECIFY_STATE: strict
|
||||||
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
|
// !LANGUAGE: +TypeEnhancementImprovementsInStrictMode
|
||||||
|
// MUTE_FOR_PSI_CLASS_FILES_READING
|
||||||
|
|
||||||
// FILE: Foo.java
|
// FILE: Foo.java
|
||||||
import org.jspecify.nullness.*;
|
import org.jspecify.nullness.*;
|
||||||
|
|||||||
+1
-2
@@ -26,8 +26,7 @@ fun main(
|
|||||||
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
|
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
|
||||||
// jspecify_nullness_mismatch
|
b.noBoundsNotNull(aNotNullNullNotNull)
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNotNull<!>)
|
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)
|
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -26,8 +26,7 @@ fun main(
|
|||||||
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
b.noBoundsNotNull(aNotNullNotNullNotNull)
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
|
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNotNullNull<!>)
|
||||||
// jspecify_nullness_mismatch
|
b.noBoundsNotNull(aNotNullNullNotNull)
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNotNull<!>)
|
|
||||||
// jspecify_nullness_mismatch
|
// jspecify_nullness_mismatch
|
||||||
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)
|
b.noBoundsNotNull(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>aNotNullNullNull<!>)
|
||||||
|
|
||||||
|
|||||||
+6
@@ -654,6 +654,12 @@ public class ForeignAnnotationsCompiledJavaTestGenerated extends AbstractForeign
|
|||||||
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
|
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
|
@Test
|
||||||
@TestMetadata("kt47422.kt")
|
@TestMetadata("kt47422.kt")
|
||||||
public void testKt47422() throws Exception {
|
public void testKt47422() throws Exception {
|
||||||
|
|||||||
+6
@@ -654,6 +654,12 @@ public class ForeignAnnotationsCompiledJavaWithPsiClassReadingTestGenerated exte
|
|||||||
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
|
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
|
@Test
|
||||||
@TestMetadata("kt47422.kt")
|
@TestMetadata("kt47422.kt")
|
||||||
public void testKt47422() throws Exception {
|
public void testKt47422() throws Exception {
|
||||||
|
|||||||
+6
@@ -654,6 +654,12 @@ public class ForeignAnnotationsSourceJavaTestGenerated extends AbstractForeignAn
|
|||||||
runTest("compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.fir.kt");
|
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
|
@Test
|
||||||
@TestMetadata("kt47422.kt")
|
@TestMetadata("kt47422.kt")
|
||||||
public void testKt47422() throws Exception {
|
public void testKt47422() throws Exception {
|
||||||
|
|||||||
+5
-3
@@ -358,7 +358,8 @@ class SignatureEnhancement(
|
|||||||
?: computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
|
?: computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
|
||||||
nullabilityFromBoundsForTypeBasedOnTypeParameter,
|
nullabilityFromBoundsForTypeBasedOnTypeParameter,
|
||||||
defaultTypeQualifier,
|
defaultTypeQualifier,
|
||||||
typeParameterForArgument
|
typeParameterForArgument,
|
||||||
|
isFromStarProjection
|
||||||
)
|
)
|
||||||
|
|
||||||
val isNotNullTypeParameter =
|
val isNotNullTypeParameter =
|
||||||
@@ -385,7 +386,8 @@ class SignatureEnhancement(
|
|||||||
private fun computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
|
private fun computeNullabilityInfoInTheAbsenceOfExplicitAnnotation(
|
||||||
nullabilityFromBoundsForTypeBasedOnTypeParameter: NullabilityQualifierWithMigrationStatus?,
|
nullabilityFromBoundsForTypeBasedOnTypeParameter: NullabilityQualifierWithMigrationStatus?,
|
||||||
defaultTypeQualifier: JavaDefaultQualifiers?,
|
defaultTypeQualifier: JavaDefaultQualifiers?,
|
||||||
typeParameterForArgument: TypeParameterDescriptor?
|
typeParameterForArgument: TypeParameterDescriptor?,
|
||||||
|
isFromStarProjection: Boolean
|
||||||
): NullabilityQualifierWithMigrationStatus? {
|
): NullabilityQualifierWithMigrationStatus? {
|
||||||
|
|
||||||
val result =
|
val result =
|
||||||
@@ -406,7 +408,7 @@ class SignatureEnhancement(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result == null) return boundsFromTypeParameterForArgument
|
if (result == null || isFromStarProjection) return boundsFromTypeParameterForArgument
|
||||||
|
|
||||||
return mostSpecific(boundsFromTypeParameterForArgument, result)
|
return mostSpecific(boundsFromTypeParameterForArgument, result)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user