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

Implementation of KT-6399: platform types under when are now counted as not nullable but warning is generated. #KT-6399 Fixed.

Browse Source 
A set of tests. Warning about Java enum nullable argument under when in particular situations.
This commit is contained in:
Mikhail Glukhikh
2015-05-18 19:02:58 +03:00
parent 0efaedd32c
commit babb7e58bc
18 changed files with 430 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt
+1 -1
View File
@@ -22,7 +22,7 @@ fun withNullableNothing(e: E?) = when (e) {
nullableNothing() -> null
}
fun platformType() = <!NO_ELSE_IN_WHEN!>when<!> (J.foo()) {
fun platformType() = when (<!WHEN_ENUM_CAN_BE_NULL_IN_JAVA!>J.foo()<!>) {
E.A -> 7
E.B -> 8
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt
+21
View File
@@ -0,0 +1,21 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
public enum J {
A, B;
public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
// When is exhaustive (count a platform enum as a special case)
return when (<!WHEN_ENUM_CAN_BE_NULL_IN_JAVA!>J.create()<!>) {
J.A -> 1
J.B -> 2
}
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt
+23
View File
@@ -0,0 +1,23 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
import org.jetbrains.annotations.*;
public enum J {
A, B;
@NotNull public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
// When is exhaustive (count a platform enum as a special case)
return when (J.create()) {
J.A -> 1
J.B -> 2
}
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
org.jetbrains.annotations.NotNull() public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt
+21
View File
@@ -0,0 +1,21 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
public enum J {
A, B;
public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
return when (J.create()) {
J.A -> 1
J.B -> 2
else -> 0
}
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt
+22
View File
@@ -0,0 +1,22 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
public enum J {
A, B;
public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
// When is exhaustive including null
return when (J.create()) {
J.A -> 1
J.B -> 2
null -> 0
}
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.kt
+20
View File
@@ -0,0 +1,20 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
public enum J {
A, B;
public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
when (<!WHEN_ENUM_CAN_BE_NULL_IN_JAVA!>J.create()<!>) {
J.A -> return 1
J.B -> return 2
}
}
compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}
compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt
+20
View File
@@ -0,0 +1,20 @@
// See KT-6399: exhaustive whens on platform enums
// FILE: J.java
public enum J {
A, B;
public static J create() {
return J.A;
}
}
// FILE: K.kt
fun foo(): Int {
// When is not-exhaustive
return <!NO_ELSE_IN_WHEN!>when<!> (J.create()) {
J.A -> 1
}
}
compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.txt
+38
View File
@@ -0,0 +1,38 @@
package
internal fun foo(): kotlin.Int
public final enum class J : kotlin.Enum<J!> {
public enum entry A : J {
private constructor A()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public enum entry B : J {
private constructor B()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public constructor J()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: J!): kotlin.Int
public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun create(): J!
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): J
public final /*synthesized*/ fun values(): kotlin.Array<J>
}