azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report warnings on overrides with wrong types nullability

Browse Source 
^KT-48899 Fixed
This commit is contained in:
Denis.Zharkov
2021-09-24 16:33:07 +03:00
committed by TeamCityServer
parent ec97dab6cd
commit f7ef551f99
29 changed files with 672 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.fir.kt
Vendored
+79
View File
@@ -0,0 +1,79 @@
// JSPECIFY_STATE: warn
// FILE: Foo.java
public interface Foo {}
// FILE: BaseClass.java
import org.jspecify.nullness.*;
@NullMarked
public class BaseClass {
public Foo everythingNotNullable(Foo x) { return null; }
public @Nullable Foo everythingNullable(@Nullable Foo x) { return null; }
public @NullnessUnspecified Foo everythingUnknown(@NullnessUnspecified Foo x) { return null; }
public @Nullable Foo mixed(Foo x) { return null; }
public Foo explicitlyNullnessUnspecified(@NullnessUnspecified Foo x) { return null; }
}
// FILE: main.kt
private val FOO = object : Foo {}
class Correct : BaseClass() {
override fun everythingNotNullable(x: Foo): Foo {
return FOO
}
override fun everythingNullable(x: Foo?): Foo? {
return null
}
override fun everythingUnknown(x: Foo?): Foo? {
return null
}
override fun mixed(x: Foo): Foo? {
return null
}
override fun explicitlyNullnessUnspecified(x: Foo): Foo {
return FOO
}
}
class WrongReturnTypes : BaseClass() {
override fun everythingNotNullable(x: Foo): Foo? {
return null
}
override fun explicitlyNullnessUnspecified(x: Foo): Foo? {
return null
}
}
class WrongParameter : BaseClass() {
override fun everythingNotNullable(x: Foo?): Foo {
return FOO
}
override fun everythingNullable(x: Foo): Foo? {
return null
}
override fun everythingUnknown(x: Foo): Foo? {
return null
}
override fun mixed(x: Foo?): Foo? {
return null
}
override fun explicitlyNullnessUnspecified(x: Foo?): Foo {
return FOO
}
}
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.kt
Vendored
+79
View File
@@ -0,0 +1,79 @@
// JSPECIFY_STATE: warn
// FILE: Foo.java
public interface Foo {}
// FILE: BaseClass.java
import org.jspecify.nullness.*;
@NullMarked
public class BaseClass {
public Foo everythingNotNullable(Foo x) { return null; }
public @Nullable Foo everythingNullable(@Nullable Foo x) { return null; }
public @NullnessUnspecified Foo everythingUnknown(@NullnessUnspecified Foo x) { return null; }
public @Nullable Foo mixed(Foo x) { return null; }
public Foo explicitlyNullnessUnspecified(@NullnessUnspecified Foo x) { return null; }
}
// FILE: main.kt
private val FOO = object : Foo {}
class Correct : BaseClass() {
override fun everythingNotNullable(x: Foo): Foo {
return FOO
}
override fun everythingNullable(x: Foo?): Foo? {
return null
}
override fun everythingUnknown(x: Foo?): Foo? {
return null
}
override fun mixed(x: Foo): Foo? {
return null
}
override fun explicitlyNullnessUnspecified(x: Foo): Foo {
return FOO
}
}
class WrongReturnTypes : BaseClass() {
<!WRONG_NULLABILITY_FOR_JAVA_OVERRIDE!>override<!> fun everythingNotNullable(x: Foo): Foo? {
return null
}
<!WRONG_NULLABILITY_FOR_JAVA_OVERRIDE!>override<!> fun explicitlyNullnessUnspecified(x: Foo): Foo? {
return null
}
}
class WrongParameter : BaseClass() {
<!WRONG_NULLABILITY_FOR_JAVA_OVERRIDE!>override<!> fun everythingNotNullable(x: Foo?): Foo {
return FOO
}
<!WRONG_NULLABILITY_FOR_JAVA_OVERRIDE!>override<!> fun everythingNullable(x: Foo): Foo? {
return null
}
override fun everythingUnknown(x: Foo): Foo? {
return null
}
<!WRONG_NULLABILITY_FOR_JAVA_OVERRIDE!>override<!> fun mixed(x: Foo?): Foo? {
return null
}
override fun explicitlyNullnessUnspecified(x: Foo?): Foo {
return FOO
}
}
compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.txt
Vendored
+57
View File
@@ -0,0 +1,57 @@
package
private val FOO: FOO.<no name provided>
@org.jspecify.nullness.NullMarked public open class BaseClass {
public constructor BaseClass()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun everythingNotNullable(/*0*/ x: Foo!): Foo!
@org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo!): @org.jspecify.nullness.Nullable Foo!
@org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo!
public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): Foo!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@org.jspecify.nullness.Nullable public open fun mixed(/*0*/ x: Foo!): @org.jspecify.nullness.Nullable Foo!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class Correct : BaseClass {
public constructor Correct()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun everythingNotNullable(/*0*/ x: Foo): Foo
public open override /*1*/ fun everythingNullable(/*0*/ x: Foo?): Foo?
public open override /*1*/ fun everythingUnknown(/*0*/ x: Foo?): Foo?
public open override /*1*/ fun explicitlyNullnessUnspecified(/*0*/ x: Foo): Foo
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun mixed(/*0*/ x: Foo): Foo?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class WrongParameter : BaseClass {
public constructor WrongParameter()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun everythingNotNullable(/*0*/ x: Foo?): Foo
public open override /*1*/ fun everythingNullable(/*0*/ x: Foo): Foo?
public open override /*1*/ fun everythingUnknown(/*0*/ x: Foo): Foo?
public open override /*1*/ fun explicitlyNullnessUnspecified(/*0*/ x: Foo?): Foo
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun mixed(/*0*/ x: Foo?): Foo?
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class WrongReturnTypes : BaseClass {
public constructor WrongReturnTypes()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ fun everythingNotNullable(/*0*/ x: Foo): Foo?
@org.jspecify.nullness.Nullable public open override /*1*/ /*fake_override*/ fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo!): @org.jspecify.nullness.Nullable Foo!
@org.jspecify.nullness.NullnessUnspecified public open override /*1*/ /*fake_override*/ fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo!
public open override /*1*/ fun explicitlyNullnessUnspecified(/*0*/ x: Foo): Foo?
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@org.jspecify.nullness.Nullable public open override /*1*/ /*fake_override*/ fun mixed(/*0*/ x: Foo!): @org.jspecify.nullness.Nullable Foo!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}